From 6a0aca87fdbfee437a189ec9c79b967d1b636cd3 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Thu, 09 May 2013 13:21:22 -0400
Subject: Add pkgdatadir and archtabdir build system vars.

---
diff --git a/Makefile.in b/Makefile.in
index 3c9f2f7..9c9db68 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,12 +32,13 @@ datadir = @datadir@
 mandir = @mandir@
 man1dir = @man1dir@
 localedir = @localedir@
+pkgdatadir = @pkgdatadir@
+archtabdir = @archtabdir@
 libopkbuild_1 = @libopkbuild_1@
 
 DESTDIR = /
 
 sh = @sh@
-archtab = @archtab@
 
 pkglibbuildsystemdir = $(pkglibdir)/buildsystem
 
@@ -74,6 +75,7 @@ distfiles = \
 	$(locale_srcs)
 
 # FIXME: libopkhelper is deprecated.  Migrate code and remove this variable.
+# FIXME: archtab is deprecated.  Migrate code and remove this variable.
 script = \
 	s&@@PACKAGE_NAME@@&$(package_name)&;\
 	s&@@PACKAGE_VERSION@@&$(package_version)&;\
@@ -81,6 +83,8 @@ script = \
 	s&@@PKGLIBDIR@@&$(pkglibdir)&;\
 	s&@@LIBOPKHELPER@@&$(libopkhelper)&;\
 	s&@@LOCALEDIR@@&$(localedir)&;\
+	s&@@ARCHTABDIR@@&$(archtabdir)&;\
+	s&@@ARCHTAB@@&$(archtabdir)&;\
 	s&@@SH@@&$(sh)&;
 
 .SUFFIXES:
diff --git a/configure b/configure
index e895089..0c287e3 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
--
cgit v0.9.1