Change 19999 by [EMAIL PROTECTED] on 2003/07/04 19:39:01
Macro reorganization in the Makefile, so that $(LDLIBPTH) always
appears just before the name of the command to be run. See
Subject: Re: PERL_SKIP_TTY_TEST fix
From: Alexey Tourbin <[EMAIL PROTECTED]>
Date: Fri, 4 Jul 2003 17:25:34 +0400
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/Makefile.SH#277 edit
Differences ...
==== //depot/perl/Makefile.SH#277 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#276~19897~ Mon Jun 30 22:04:50 2003
+++ perl/Makefile.SH Fri Jul 4 12:39:01 2003
@@ -746,13 +746,13 @@
[EMAIL PROTECTED] -f vms/perlvms.pod && cd pod && $(LNS) ../vms/perlvms.pod
perlvms.pod && cd .. && echo "pod/perlvms.pod" >> extra.pods
extras.make: perl$(EXE_EXT)
- [EMAIL PROTECTED] -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH}
PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst`
+ [EMAIL PROTECTED] -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)
- [EMAIL PROTECTED] -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH}
PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst`
+ [EMAIL PROTECTED] -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)
- [EMAIL PROTECTED] -s extras.lst && $(LDLIBPTH) PATH=`pwd`:${PATH}
PERL5LIB=`pwd`/lib ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst`
+ [EMAIL PROTECTED] -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
@@ -1053,10 +1053,10 @@
PERL=./perl $(MAKE) _test_prep
_test_tty:
- cd t && $(LDLIBPTH) $(PERL_DEBUG) $(PERL) $(TESTFILE) $(TEST_ARGS) </dev/tty
+ cd t && $(PERL_DEBUG) $(LDLIBPTH) $(PERL) $(TESTFILE) $(TEST_ARGS) </dev/tty
_test_notty:
- cd t && $(LDLIBPTH) $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(PERL) $(TESTFILE)
$(TEST_ARGS)
+ cd t && $(PERL_DEBUG) PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) $(PERL) $(TESTFILE)
$(TEST_ARGS)
# The second branch is for testing without a tty or controlling terminal,
# see t/op/stat.t
End of Patch.
