summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGisle Aas <gisle@aas.no>2014-05-04 16:09:23 -0600
committerRicardo Signes <rjbs@cpan.org>2014-05-13 22:31:31 -0400
commit078902ab1e24d7f55fb866a0939a7228fbfe0b8b (patch)
tree7206ad489718e9bbbf6b931cb04bc593ec4726d3
parentcfe3322a9b07f6d396890b6c564e7ad953719819 (diff)
downloadperl-078902ab1e24d7f55fb866a0939a7228fbfe0b8b.tar.gz
Fix broken Makefile on Solaris 10.
This uses sed to avoid the problem of the sh not being modern enough. The commiter moved the sed so it appears in just one place.
-rwxr-xr-xMakefile.SH9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 6411b900b6..b65a7f3fa7 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1052,19 +1052,20 @@ install: install-all
for name in all notify silent strip verbose; do
flags="--$name";
+ flags=`echo $flags | sed -e 's/--all//'`
if test "X$hostperl" != X; then
$spitshell >>$Makefile <<EOT
install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
- \$(HOST_PERL) installperl --destdir=\$(DESTDIR) ${flags%--all} \$(INSTALLFLAGS) \$(STRIPFLAGS)
- \$(HOST_PERL) installman --destdir=\$(DESTDIR) ${flags%--all}
+ \$(HOST_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS)
+ \$(HOST_PERL) installman --destdir=\$(DESTDIR) $flags
EOT
else
$spitshell >>$Makefile <<EOT
install_$name install-$name: \$(INSTALL_DEPENDENCE) installperl all installman
- \$(RUN_PERL) installperl --destdir=\$(DESTDIR) ${flags%--all} \$(INSTALLFLAGS) \$(STRIPFLAGS)
- \$(RUN_PERL) installman --destdir=\$(DESTDIR) ${flags%--all}
+ \$(RUN_PERL) installperl --destdir=\$(DESTDIR) $flags \$(INSTALLFLAGS) \$(STRIPFLAGS)
+ \$(RUN_PERL) installman --destdir=\$(DESTDIR) $flags
EOT
fi