diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2015-09-04 05:11:18 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-09-04 17:24:26 +0200 |
| commit | f94c473156f5655e96b386e154c97316c0a6b62d (patch) | |
| tree | e4c5b3f25180afe3b2d9d85260f386a99fd0fe37 | |
| parent | 9f795dc201e1868e9d8bdb7a561499090df03773 (diff) | |
| download | urpmi-f94c473156f5655e96b386e154c97316c0a6b62d.tar urpmi-f94c473156f5655e96b386e154c97316c0a6b62d.tar.gz urpmi-f94c473156f5655e96b386e154c97316c0a6b62d.tar.bz2 urpmi-f94c473156f5655e96b386e154c97316c0a6b62d.tar.xz urpmi-f94c473156f5655e96b386e154c97316c0a6b62d.zip | |
fix installing /sbin/*
Apparently perl-2.22's ExtUtils-MakeMaker started wrapping the $(....)
variables in double-quotes, which broke urpmi's "make install"...
v2: perl_checker cleanups (Thierry Vignaud)
| -rwxr-xr-x | Makefile.PL | 8 | ||||
| -rw-r--r-- | NEWS | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.PL b/Makefile.PL index ef498547..8340ad03 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -58,12 +58,16 @@ sub install { my $inherited = shift->SUPER::install(@_); # Take into account scripts in sbin under blib # and new manpage sections - $inherited =~ s/\$\(INST_BIN\) \$\(DESTINSTALL(\w*)BIN\)/$& \$(INST_SBIN) \$(DESTINSTALL$1SBIN) \$(INST_LIBEXEC) \$(DESTINSTALLLIBEXECDIR) \$(INST_MAN5DIR) \$(DESTINSTALLMAN5DIR) \$(INST_MAN8DIR) \$(DESTINSTALLMAN8DIR)/g; + if ($inherited !~ s/"\$\(INST_BIN\)" "\$\(DESTINSTALL(\w*)BIN\)"/$& "\$(INST_SBIN)" "\$(DESTINSTALL$1SBIN)" "\$(INST_LIBEXEC)" "\$(DESTINSTALLLIBEXECDIR)" "\$(INST_MAN5DIR)" "\$(DESTINSTALLMAN5DIR)" "\$(INST_MAN8DIR)" "\$(DESTINSTALLMAN8DIR)"/g) { + die "Could not replace INST_SBIN!"; + } # install files under /etc and /var my $po = $with_po ? ' installpo' : ''; my $polkit = $with_polkit ? ' installpolkit' : ''; my $gui = $with_gui ? ' installgurpmi2' : ''; - $inherited =~ s/^install ::/$& installconfigfiles installstatedir$po$polkit$gui/gm; + if ($inherited !~ s/^install ::/$& installconfigfiles installstatedir$po$polkit$gui/gm) { + die "Could not replace install."; + } $inherited; } @@ -1,3 +1,5 @@ +- fix installing /sbin/* + (regression with perl-5.22's ExtUtils-MakeMaker now wrapping $(...) ) - fix perl_checker checking Version 8.07 - 3 September 2015 |