summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-05-16 18:29:41 -0400
committerJoey Hess <joey@kitenet.net>2013-05-16 18:29:41 -0400
commit0bf4f868dea74ffa12cd2dd23ec360e4f29ce551 (patch)
tree158e5498d6ca1c74e28cd4d1983d85bb64ac2cb9
parent163d38ce08394f15a685231797238de9556be8fd (diff)
Revert unsetting INSTALL_BASE. Closes: #708452 Reopens: #705141
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index bb0478a..60cda3d 100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@ -54,7 +54,7 @@ sub configure {
push @flags, "LD=$Config{ld} $ENV{CFLAGS} $ENV{LDFLAGS}";
}
- $this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor", "INSTALL_BASE=",
+ $this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor",
# if perl_build is not tested first, need to pass packlist
# option to handle fallthrough case
(compat(7) ? "create_packlist=0" : ()),
diff --git a/debian/changelog b/debian/changelog
index 1c9ed3f..bc6b8cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (9.20130510) UNRELEASED; urgency=low
+
+ * Revert unsetting INSTALL_BASE. Closes: #708452 Reopens: #705141
+
+ -- Joey Hess <joeyh@debian.org> Thu, 16 May 2013 18:27:50 -0400
+
debhelper (9.20130509) unstable; urgency=low
* dh_installinit: Remove obsolete systemd-tempfiles hack in postinst