diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 2003-11-04 12:10:16 -0800 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2003-11-10 20:55:25 +0000 |
| commit | 70eaf669f8c2c2eadbd10ffbbd168124d20b8745 (patch) | |
| tree | f6893c43fa7a4fdb8a2220c5f53326dbdb95a691 /Makefile.SH | |
| parent | 4151a5feffa8bdd67c09edf6ade78431e8079f67 (diff) | |
| download | perl-70eaf669f8c2c2eadbd10ffbbd168124d20b8745.tar.gz | |
[PATCH 5.8.2 @21574] make install: line noise
Date: Tue, 4 Nov 2003 20:10:16 -0800
Message-ID: <20031105041016.GA2639@math.berkeley.edu>
and part of
Subject: [PATCH 5.8.2 @21574] make install: PREFIX and DESTDIR
From: Ilya Zakharevich <nospam-abuse@ilyaz.org>
Date: Tue, 4 Nov 2003 20:18:37 -0800
Message-ID: <20031105041836.GA2649@math.berkeley.edu>
(I've left out the PREFIX part for now)
p4raw-id: //depot/perl@21697
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Makefile.SH b/Makefile.SH index 713b2a3839..faf85f0b76 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -763,13 +763,13 @@ extra.pods: miniperl$(EXE_EXT) -@test -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods extras.make: perl$(EXE_EXT) - -@test -s extras.lst && PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` + -@test -s extras.lst && PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` extras.test: perl$(EXE_EXT) - -@test -s extras.lst && PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` + -@test -s extras.lst && PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` extras.install: perl$(EXE_EXT) - -@test -s extras.lst && PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` + -@test -s extras.lst && PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` .PHONY: install install-strip install-all install-verbose install-silent \ no-install install.perl install.man install.html @@ -778,21 +778,24 @@ META.yml: Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm $(LDLIBPTH) ./miniperl -Ilib Porting/makemeta install-strip: - $(MAKE) STRIPFLAGS=-s install + $(MAKE) STRIPFLAGS=-s install DESTDIR="$(DESTDIR)" install install-all: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) DESTDIR="$(DESTDIR)" install-verbose: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-V + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-V DESTDIR="$(DESTDIR)" install-silent: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-S + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-S DESTDIR="$(DESTDIR)" no-install: - $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n + $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n DESTDIR="$(DESTDIR)" -install.perl: all installperl +# Set this to an empty string to avoid an attempt of rebuild before install +INSTALL_DEPENDENCE = all + +install.perl: $(INSTALL_DEPENDENCE) installperl if [ -n "$(COMPILE)" ]; \ then \ cd utils; $(MAKE) compile; \ |