Makefile.conf.in: use @libdir@ and @admindir@

configure.in: add --with-admindir option and change the default to $libdir/db
debian/rules: add --with-admindir=/var/lib/dpkg
scripts/debian-changelog-mode.el: update location of GPL
scripts/dpkg-name.sh: update location of GPL

diff --git a/ChangeLog b/ChangeLog
index 7fd2caf454f9c7647a3e0aeb31602cd0a2e752f5..febedacc66708a71880cc39c7b27a11d49f0c905 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Dec 17 00:41:50 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Makefile.conf.in: use @libdir@ and @admindir@
+  * configure.in: add --with-admindir option and change the default
+    to $libdir/db
+  * debian/rules: add --with-admindir=/var/lib/dpkg
+  * scripts/debian-changelog-mode.el: update location of GPL
+  * scripts/dpkg-name.sh: update location of GPL
+
 Thu Dec 16 15:20:11 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * utils/start-stop-daemon.c: Fix OS-detection for sunos

diff --git a/Makefile.conf.in b/Makefile.conf.in
index 05fa4c13dbe9d7bfcb149be8919fc8394f123c3b..15ae7464473c1398c50128782cf23f9be55908b8 100644 (file)
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -17,14 +17,14 @@ localedir           = $(datadir)/locale
 bindir                 = @bindir@
 sbindir                        = @sbindir@
 
-libdir                 = $(prefix)/lib
+libdir                 = @libdir@
 dpkglibdir             = $(libdir)/$(PACKAGE)
 
 methodsdir             = $(dpkglibdir)/methods
 parsechangelogdir      = $(dpkglibdir)/parsechangelog
 elispdir               = @lispdir@
 
-admindir               = /var/lib/$(PACKAGE)
+admindir               = @admindir@
 
 mandir                 = @mandir@
 man1dir                        = $(mandir)/man1

diff --git a/configure.in b/configure.in
index ab00fcdf8cfaf10d56a486b16ee88fc3c82703ba..57a337f6af113681224dd249ca49d7e7f511623c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,19 @@ AC_ARG_WITH(dselect,
  esac])
 AC_SUBST(DSELECTDIR)
 
+admindir="$libdir/db"
+AC_ARG_WITH(admindir,
+[  --with-admindir=DIR     store dpkg database in DIR [LIBDIR/db]],
+[case "$withval" in
+  "" )
+    AC_MSG_ERROR(invalid admindir specified)
+    ;;
+  * )
+    admindir="$withval"
+    ;;
+ esac])
+AC_SUBST(admindir)
+
 AC_CHECK_TOOL_PREFIX
 AC_CANONICAL_SYSTEM
 

diff --git a/debian/rules b/debian/rules
index a7da4e5d73a8d82c7430257b116fd6d5bb00b41f..ebdbf9cc844ce2d8c16fa3d23d90d2c94620c4cb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ $(BUILD)/config.status:
                --infodir=/usr/share/info \
                --sysconfdir=/etc \
                --sharedstatedir=/var/lib \
-               --localstatedir=/var/lib
+               --localstatedir=/var/lib \
+               --with-admindir=/var/lib/dpkg
 
 clean:
        $(checkdir)

diff --git a/scripts/debian-changelog-mode.el b/scripts/debian-changelog-mode.el
index d6b9fb38254abb8b4864561894c5fc759f561fe7..9a73eeb402b3055a1ad9b787a0e018b9982f44a6 100644 (file)
--- a/scripts/debian-changelog-mode.el
+++ b/scripts/debian-changelog-mode.el
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 ;;
 ;; You should have received a copy of the GNU General Public License
-;; along with your Debian installation, in /usr/doc/copyright/GPL.
+;; along with your Debian installation, in /usr/share/common-licenses/GPL.
 ;; If not, write to the Free Software Foundation, 675 Mass Ave,
 ;; Cambridge, MA 02139, USA.
 

diff --git a/scripts/dpkg-name.sh b/scripts/dpkg-name.sh
index fc4c2371a2e78b2c5e34041b413db44933d2d0c6..ac6aec8e2711f9957e7b264ed8cbae8407880eb2 100755 (executable)
--- a/scripts/dpkg-name.sh
+++ b/scripts/dpkg-name.sh
@@ -19,7 +19,7 @@ echo "# ${prog} ${version} -- ${purpose}
 # This is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file
-# /usr/doc/copyright/GPL for more details."
+# /usr/share/common-licenses/GPL for more details."
 }
 
 stderr () {