From 58c31de0ee34171ad79a3e74f54b135c62c5ac56 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Tue, 06 Nov 2012 17:52:40 -0500
Subject: Change archtab path in testsetup.sh.

---
(limited to 'testsetup.sh')

diff --git a/testsetup.sh b/testsetup.sh
index 3c9ad59..4599fcb 100755
--- a/testsetup.sh
+++ b/testsetup.sh
@@ -25,8 +25,7 @@ sysconfdir=''
 
 long_opts_with_args='
 prefix
-datadir
-sysconfdir
+libdir
 '
 
 main()
@@ -35,7 +34,7 @@ main()
 	shift ${optind}
 
 	[ -z "${prefix}" ] && prefix='/usr/local'
-	[ -z "${datadir}" ] && datadir="${prefix}/share"
+	[ -z "${libdir}" ] && libdir="${prefix}/share"
 
 	if [ ${#} -ne 0 ]; then
 		print_usage
@@ -44,47 +43,48 @@ main()
 
 	printf 'Generating build system architecture data...\n'
 
-	mkdir -p "${datadir}/opkhelper/archtab" || \
+	archtab="${libdir}/archtab"
+	mkdir -p "${archtab}" || \
 		error 'Cannot make architecture table directory'
 
 	# core-linux-eglibc
-	mkdir "${datadir}/opkhelper/archtab/core-linux-eglibc" || \
+	mkdir "${archtab}/core-linux-eglibc" || \
 		error 'Cannot make architecture table directory'
 	printf 'x86_64-unknown-linux-gnu\n' \
-		>"${datadir}/opkhelper/archtab/core-linux-eglibc/autoconf" || \
+		>"${archtab}/core-linux-eglibc/autoconf" || \
 		error 'Cannot write architecture data'
 	printf 'x86\ni386\n' \
-		>"${datadir}/opkhelper/archtab/core-linux-eglibc/kbuild" || \
+		>"${archtab}/core-linux-eglibc/kbuild" || \
 		error 'Cannot write architecture data'
 
 	# i686-linux-eglibc
-	mkdir "${datadir}/opkhelper/archtab/i686-linux-eglibc" || \
+	mkdir "${archtab}/i686-linux-eglibc" || \
 		error 'Cannot make architecture table directory'
 	printf 'i686-unknown-linux-gnu\n' \
-		>"${datadir}/opkhelper/archtab/i686-linux-eglibc/autoconf" || \
+		>"${archtab}/i686-linux-eglibc/autoconf" || \
 		error 'Cannot write architecture data'
 	printf 'x86\ni386\n' \
-		>"${datadir}/opkhelper/archtab/i686-linux-eglibc/kbuild" || \
+		>"${archtab}/i686-linux-eglibc/kbuild" || \
 		error 'Cannot write architecture data'
 
 	# i686-kfreebsd-eglibc
-	mkdir "${datadir}/opkhelper/archtab/i686-kfreebsd-eglibc" || \
+	mkdir "${archtab}/i686-kfreebsd-eglibc" || \
 		error 'Cannot make architecture table directory'
 	printf 'i686-unknown-freebsd9.0\n' \
-		>"${datadir}/opkhelper/archtab/i686-kfreebsd-eglibc/autoconf" || \
+		>"${archtab}/i686-kfreebsd-eglibc/autoconf" || \
 		error 'Cannot write architecture data'
 	printf 'x86\ni386\n' \
-		>"${datadir}/opkhelper/archtab/i686-kfreebsd-eglibc/kbuild" || \
+		>"${archtab}/i686-kfreebsd-eglibc/kbuild" || \
 		error 'Cannot write architecture data'
 
 	# cortexa8-linux-eglibc
-	mkdir "${datadir}/opkhelper/archtab/cortexa8-linux-eglibc" || \
+	mkdir "${archtab}/cortexa8-linux-eglibc" || \
 		error 'Cannot make architecture table directory'
 	printf 'arm-cortex_a8-linux-gnueabi\n' \
-		>"${datadir}/opkhelper/archtab/cortexa8-linux-eglibc/autoconf" || \
+		>"${archtab}/cortexa8-linux-eglibc/autoconf" || \
 		error 'Cannot write architecture data'
 	printf 'arm\n' \
-		>"${datadir}/opkhelper/archtab/cortexa8-linux-eglibc/kbuild" || \
+		>"${archtab}/cortexa8-linux-eglibc/kbuild" || \
 		error 'Cannot write architecture data'
 
 	printf 'Done!\n'
--
cgit v0.9.1