summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-05-05 11:35:15 -0400
committerJoey Hess <joey@kitenet.net>2013-05-05 11:35:15 -0400
commit89c2e3111c13cd85942dd1063ae5a3ab365278e2 (patch)
tree7c5328e2de3bc3b16ab428af831da813674eb570
parent56ca3a1da83bb4abd2153f72658ad816a4f47fad (diff)
perl_makemaker: Unset INSTALL_BASE in case the user has it set. Closes: #705141
-rw-r--r--Debian/Debhelper/Buildsystem/perl_makemaker.pm2
-rw-r--r--debian/changelog7
2 files changed, 8 insertions, 1 deletions
diff --git a/Debian/Debhelper/Buildsystem/perl_makemaker.pm b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
index 60cda3d0..bb0478ae 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",
+ $this->doit_in_sourcedir("perl", "Makefile.PL", "INSTALLDIRS=vendor", "INSTALL_BASE=",
# 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 9dd54310..62ae85d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (9.20130505) UNRELEASED; urgency=low
+
+ * perl_makemaker: Unset INSTALL_BASE in case the user has it set.
+ Closes: #705141
+
+ -- Joey Hess <joeyh@debian.org> Sun, 05 May 2013 11:34:20 -0400
+
debhelper (9.20130504) unstable; urgency=low
* dh_shlibdeps: Warn if -V flag is passed, to avoid it accidentially being