From 763a15f4cbd11d4be4eb52da62533cb72d691a12 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Thu, 09 May 2013 14:07:35 -0400
Subject: Merge branch 'feature/provide-archtab'.

---
(limited to 'configure')

diff --git a/configure b/configure
index e895089..fbd944a 100755
--- a/configure
+++ b/configure
@@ -35,6 +35,8 @@ datadir='${prefix}/share'
 mandir='${datadir}/man'
 man1dir='${mandir}/man1'
 localedir='${datadir}/locale'
+pkgdatadir='${datadir}/${package_name}'
+archtabdir='${pkgdatadir}/archtab'
 multiarch_libdir='false'
 
 quiet='false'
@@ -45,7 +47,6 @@ make
 '
 dep_libs='
 libopkbuild.1
-archtab
 '
 
 long_opts_with_args='
@@ -58,6 +59,8 @@ datadir
 mandir
 man1dir
 localedir
+pkgdatadir
+archtabdir
 '
 
 features="
@@ -169,6 +172,10 @@ Installation directories:
                           default: MANDIR/man1
   --localedir=LOCALEDIR   install locales in LOCALEDIR
                           default: DATADIR/locale
+  --pkgdatadir=PKGDATADIR install package data in PKGDATADIR
+                          default: DATADIR/${package_name}
+  --archtabdir=ARCHTABDIR install architecture table entries in ARCHTABDIR
+                          default: PKGDATADIR/archtab
 
 Features:
   --with-multiarch-libdir=BOOL
@@ -340,11 +347,6 @@ write_makefiles()
 		_sed_script="${_sed_script}s&@${_var}@&$(eval echo \$\{"${_var}"\})&g;"
 	done
 	sed "${_sed_script}" "${srcdir}/Makefile.in" >'Makefile'
-
-	# New and improved kludge to generate an architecture table for testing.
-	# TODO: Remove when no longer used.
-	sed "${_sed_script}" "${srcdir}/mkarchtab.in" >'mkarchtab'
-	chmod 755 'mkarchtab'
 }
 
 main "${@}"
--
cgit v0.9.1