summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.SH13
-rwxr-xr-xinstallman3
-rwxr-xr-xinstallperl2
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.SH b/Makefile.SH
index a7cbaadc8b..423a11889e 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -553,14 +553,17 @@ extra.pods: miniperl
install-strip:
$(MAKE) STRIPFLAGS=-s install
-install: all
+install:
$(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS)
-install-verbose: all
- $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=--verbose
+install-verbose:
+ $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-V
-install-silent: all
- $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=--silent
+install-silent:
+ $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-s
+
+no-install:
+ $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n
install.perl: all installperl
if [ -n "$(COMPILE)" ]; \
diff --git a/installman b/installman
index 7f7837b94f..c1f3837416 100755
--- a/installman
+++ b/installman
@@ -49,9 +49,8 @@ $opts{man3dir} = $Config{'installman3dir'}
$opts{man3ext} = $Config{'man3ext'}
unless defined($opts{man3ext});
$opts{silent} ||= $opts{S};
-$opts{verbose} ||= $opts{V};
-
$opts{notify} ||= $opts{n};
+$opts{verbose} ||= $opts{V} || $opts{notify};
#Sanity checks
diff --git a/installperl b/installperl
index 84e51f4c3d..b1a1877060 100755
--- a/installperl
+++ b/installperl
@@ -56,7 +56,7 @@ while (@ARGV) {
$versiononly = 1 if $ARGV[0] eq '-v';
$silent = 1 if $ARGV[0] eq '-S';
$otherperls = 0 if $ARGV[0] eq '-o';
- $verbose = 1 if $ARGV[0] eq '-V';
+ $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
shift;
}