diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-08-22 22:18:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-08-22 22:18:10 -0400 |
| commit | cae2e136065a0925ed10e7122b098cf5f3ed4905 (patch) | |
| tree | d21b26982947ce8cea7f04778dfbbc6ce4394532 | |
| parent | 69b4dec41ea998cd7e245bf5fedb272e2402904d (diff) | |
dh_auto_install: Improve check for MakeMaker, to avoid passing PREFIX if the Makefile was generated by Module::Build::Compat. Closes: #496157
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | dh_auto_install | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ddbe4ee3..6df4a4f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ debhelper (7.0.17) UNRELEASED; urgency=low [ Joey Hess ] * dh_gencontrol: Drop the Homepage field from udebs. Closes: #492719 * Typo. Closes: #493062 + * dh_auto_install: Improve check for MakeMaker, to avoid passing PREFIX + if the Makefile was generated by Module::Build::Compat. Closes: #496157 -- Per Olofsson <pelle@debian.org> Wed, 23 Jul 2008 10:52:14 +0200 diff --git a/dh_auto_install b/dh_auto_install index fa21a010..8e7ab907 100755 --- a/dh_auto_install +++ b/dh_auto_install @@ -63,10 +63,13 @@ $destdir=cwd()."/".$destdir; if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") { $ENV{MAKE}="make" unless exists $ENV{MAKE}; my @params="DESTDIR=$destdir"; - # Special case for MakeMaker. - if (-e "Makefile.PL") { + + # Special case for MakeMaker generated Makefiles. + if (-e "Makefile" && + system('grep -q "generated automatically by MakeMaker" Makefile') == 0) { push @params, "PREFIX=/usr"; } + foreach my $target (qw{install}) { # Use make -n to check to see if the target would do # anything. There's no good way to test if a target exists. |