Pārlūkot izejas kodu

build: Change default admindir to LOCALSTATEDIR/lib/dpkg

The old LOCALSTATEDIR/dpkg admindir default forced to set localstatedir
to /var/lib, which is not correct. We can now set it to the correct /var.
Guillem Jover 16 gadi atpakaļ
vecāks
revīzija
9bc511c4a0
3 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 2 2
      configure.ac
  2. 2 0
      debian/changelog
  3. 1 1
      debian/rules

+ 2 - 2
configure.ac

@@ -59,10 +59,10 @@ AM_CONDITIONAL(WITH_INSTALL_INFO,
 	[test "x$build_install_info" = "xyes"])
 
 # Allow alternate admin directory
-admindir="${localstatedir}/${PACKAGE_NAME}"
+admindir="${localstatedir}/lib/${PACKAGE_NAME}"
 AC_ARG_WITH(admindir,
 	AS_HELP_STRING([--with-admindir=DIR],
-		       [dpkg database directory [[LOCALSTATEDIR/dpkg]]]),
+		       [dpkg database directory [[LOCALSTATEDIR/lib/dpkg]]]),
 [case "$with_admindir" in
       "") AC_MSG_ERROR([invalid admindir specified]) ;;
       *) admindir="$with_admindir" ;;

+ 2 - 0
debian/changelog

@@ -35,6 +35,8 @@ dpkg (1.15.8) UNRELEASED; urgency=low
       installed by autopoint for all po/ directories.
     - Add versioned Build-Depends.
   * Fix variable usage after delete in dselect.
+  * Change default configure admindir to LOCALSTATEDIR/lib/dpkg from
+    LOCALSTATEDIR/dpkg, so that we can use a correct --localstatedir=/var.
 
   [ Updated programs translations ]
   * Russian (Yuri Kozlov). Closes: #579149

+ 1 - 1
debian/rules

@@ -53,7 +53,7 @@ build-tree/config.status: configure
 		--mandir=\$${datadir}/man \
 		--infodir=\$${datadir}/info \
 		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
+		--localstatedir=/var \
 		--with-zlib \
 		--with-bz2