diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | scripts/Dpkg.pm | 3 | ||||
| -rw-r--r-- | scripts/Makefile.am | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index cdd61a434..ca38fd561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -149,6 +149,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium - Use cp with -R instead of -r (the former is more portable and not marked as deprecated by POSIX). - Print an actual newline instead of a literal \n in lcov output. + - Do not honor DPKG_DATADIR on the installed Dpkg module. [ Updated man pages translations ] * German (Helge Kreutzmann). diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm index deecfb35d..89964b40a 100644 --- a/scripts/Dpkg.pm +++ b/scripts/Dpkg.pm @@ -87,8 +87,7 @@ our $PROGVERSION = '1.18.x'; our $CONFDIR = '/etc/dpkg'; our $ADMINDIR = '/var/lib/dpkg'; our $LIBDIR = '.'; -our $DATADIR = '..'; -$DATADIR = $ENV{DPKG_DATADIR} if defined $ENV{DPKG_DATADIR}; +our $DATADIR = $ENV{DPKG_DATADIR} // '..'; # XXX: Backwards compatibility, to be removed on VERSION 2.00. ## no critic (Variables::ProhibitPackageVars) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b9b7314f5..fd97ea0dc 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -123,11 +123,11 @@ man3_MANS = do_perl_subst = $(AM_V_GEN) sed \ -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \ - -e "s:\$$CONFDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$CONFDIR='$(pkgconfdir)':" \ - -e "s:\$$ADMINDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$ADMINDIR='$(admindir)':" \ - -e "s:\$$LIBDIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$LIBDIR='$(pkglibdir)':" \ - -e "s:\$$DATADIR[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$DATADIR='$(pkgdatadir)':" \ - -e "s:\$$PROGVERSION[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$PROGVERSION='$(PACKAGE_VERSION)':" + -e "s:\$$CONFDIR = .*;:\$$CONFDIR = '$(pkgconfdir)';:" \ + -e "s:\$$ADMINDIR = .*;:\$$ADMINDIR = '$(admindir)';:" \ + -e "s:\$$LIBDIR = .*;:\$$LIBDIR = '$(pkglibdir)';:" \ + -e "s:\$$DATADIR = .*;:\$$DATADIR = '$(pkgdatadir)';:" \ + -e "s:\$$PROGVERSION = .*;:\$$PROGVERSION = '$(PACKAGE_VERSION)';:" do_shell_subst = $(AM_V_GEN) sed \ -e "s:^version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:version=\"$(PACKAGE_VERSION)\":" |