diff options
| author | Alexey Tourbin <at@altlinux.ru> | 2003-07-04 21:25:34 +0400 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2003-07-04 19:39:01 +0000 |
| commit | 2a30c5e0c7700acf7c1205bda81f1853b9257109 (patch) | |
| tree | 70af79d1648232e78678ff28d72159bf6eddb740 /Makefile.SH | |
| parent | 2e672bf1391c64c512cc6e5f1b1fd73fb2d6d015 (diff) | |
| download | perl-2a30c5e0c7700acf7c1205bda81f1853b9257109.tar.gz | |
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
Message-ID: <20030704132534.GC1531@julia.office.altlinux.ru>
p4raw-id: //depot/perl@19999
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.SH b/Makefile.SH index 43ad32fa30..ace595c1a7 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -746,13 +746,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 && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./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 && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./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 && $(LDLIBPTH) PATH=`pwd`:${PATH} PERL5LIB=`pwd`/lib ./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 @@ -1053,10 +1053,10 @@ test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST 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 |