From f94c473156f5655e96b386e154c97316c0a6b62d Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 4 Sep 2015 05:11:18 -0400 Subject: 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) --- Makefile.PL | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Makefile.PL') 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; } -- cgit v1.2.1