From 70eaf669f8c2c2eadbd10ffbbd168124d20b8745 Mon Sep 17 00:00:00 2001
From: Ilya Zakharevich <ilya@math.berkeley.edu>
Date: Tue, 4 Nov 2003 12:10:16 -0800
Subject: [PATCH] [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
---
 Makefile.SH      | 21 ++++++++++++---------
 installperl      |  1 +
 os2/Makefile.SHs |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile.SH b/Makefile.SH
index 713b2a3..faf85f0 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; \
diff --git a/installperl b/installperl
index b734b4b..58c81f5 100755
--- a/installperl
+++ b/installperl
@@ -103,6 +103,7 @@ Usage $0: [switches]
             name.
   -p        Don't install the pod files. [This will break use diagnostics;]
   -netware  Install correctly on a Netware server.
+  -destdir  Prefix installation directories by this string.
 EOT
 	exit;
     }
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index 2a098c9..ad688b8 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -288,7 +288,7 @@ aout_clean:
 aout_install: perl_ aout_install.perl
 
 aout_install.perl: perl_ installperl
-	./perl_ installperl
+	./perl_ installperl --destdir="$(DESTDIR)"
 
 perlrexx: $(PERLREXX_DLL)
 	@sh -c true
-- 
2.7.4