From f5e51958a7568878f41cbe999a20a5fd2fc9e608 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sun, 05 May 2013 21:14:06 -0400
Subject: Add pkglibdir variable (to replace libopkhelper).

---
diff --git a/Makefile.in b/Makefile.in
index 5d6073e..b5a85eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,9 +24,10 @@ srcdir = @srcdir@
 prefix = @prefix@
 bindir = @bindir@
 libdir = @libdir@
+pkglibdir = @pkglibdir@
+libopkhelper = @libopkhelper@
 datadir = @datadir@
 mandir = @mandir@
-libopkhelper = @libopkhelper@
 libopkbuild_1 = @libopkbuild_1@
 
 DESTDIR = /
@@ -39,9 +40,10 @@ MACROS = \
 	'prefix=$(prefix)' \
 	'bindir=$(bindir)' \
 	'libdir=$(libdir)' \
+	'pkglibdir=$(pkglibdir)' \
+	'libopkhelper=$(libopkhelper)' \
 	'datadir=$(datadir)' \
 	'mandir=$(mandir)' \
-	'libopkhelper=$(libopkhelper)' \
 	'libopkbuild_1=$(libopkbuild_1)' \
 	'archtab=$(archtab)'
 
diff --git a/configure b/configure
index 6041650..dc23cde 100755
--- a/configure
+++ b/configure
@@ -22,15 +22,17 @@
 package_name='opkhelper'
 package_version='3.0.0-beta1'
 package_description='OPK Build Helper Tools'
+package_library='libopkhelper.3.0'
 
 srcdir="$(cd "${0%/*}" && pwd)"
 prefix='/usr/local'
 bindir='${prefix}/bin'
 libdir='${prefix}/share'
+pkglibdir='${libdir}/${package_library}'
+libopkhelper='${pkglibdir}'
 datadir='${prefix}/share'
 mandir='${datadir}/man'
 localedir='${datadir}/locale'
-libopkhelper='${libdir}/libopkhelper.3.0'
 multiarch_libdir='false'
 
 quiet='false'
@@ -49,6 +51,7 @@ srcdir
 prefix
 bindir
 libdir
+pkglibdir
 datadir
 mandir
 localedir
@@ -66,6 +69,7 @@ subst_vars="
 package_name
 package_version
 package_description
+package_library
 ${long_opts_with_args}
 libopkhelper
 ${features}
@@ -151,6 +155,8 @@ Installation directories:
                           default: PREFIX/bin
   --libdir=LIBDIR         install library scripts in LIBDIR
                           default: PREFIX/share
+  --pkglibdir=PKGLIBDIR   install package library scripts in PKGLIBDIR
+                          default: LIBDIR/${package_library}
   --datadir=DATADIR       expect to find data in DATADIR
                           default: PREFIX/share
   --mandir=MANDIR         install manual pages in MANDIR
--
cgit v0.9.1