summaryrefslogtreecommitdiff
path: root/Makefile.SH
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2012-04-24 18:41:47 +0200
committerNicholas Clark <nick@ccl4.org>2013-07-13 12:32:13 +0200
commit6784814bae49a9e0f26db3808d8c3e67e688cc57 (patch)
treeb31126e6b8ccce314f4b0c3856872445ff205e65 /Makefile.SH
parentc72cb6ab5d35e3fb80cc6b454c008c01c3064b95 (diff)
downloadperl-6784814bae49a9e0f26db3808d8c3e67e688cc57.tar.gz
Refactor the Makefile so that the install target depends on install-all.
Also, add targets install_notify and install-notify, as synonyms for no_install and no-install. Previously install, install-all and install_all were all generated by the same rule. These changes make future refactoring easier.
Diffstat (limited to 'Makefile.SH')
-rwxr-xr-xMakefile.SH8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.SH b/Makefile.SH
index 46c26205ca..6e533e1343 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1009,7 +1009,7 @@ extras.install: $(PERL_EXE)
install_strip install-strip:
$(MAKE) STRIPFLAGS=-s install DESTDIR="$(DESTDIR)"
-install install_all install-all:
+install_all install-all:
$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) DESTDIR="$(DESTDIR)"
install_verbose install-verbose:
@@ -1018,12 +1018,16 @@ install_verbose install-verbose:
install_silent install-silent:
$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-S DESTDIR="$(DESTDIR)"
-no_install no-install:
+install_notify install-notify:
$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n DESTDIR="$(DESTDIR)"
# Set this to an empty string to avoid an attempt of rebuild before install
INSTALL_DEPENDENCE = all
+no_install no-install: install-notify
+
+install: install-all
+
install.perl: $(INSTALL_DEPENDENCE) installperl
$(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS)
-@test ! -s extras.lst || $(MAKE) extras.install