From: Jarkko Hietaniemi Date: Mon, 26 Jul 1999 11:38:36 +0000 (+0000) Subject: Back out #3735. Needs more work. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=92c28edd459d810e3c841dc07d7846c462b368a9;p=p5sagit%2Fp5-mst-13.2.git Back out #3735. Needs more work. p4raw-id: //depot/cfgperl@3770 --- diff --git a/Makefile.SH b/Makefile.SH index 48b5cba..626dfe1 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -194,22 +194,7 @@ SHELL = $sh # how to tr(anslate) newlines TRNL = '$trnl' -# this is where the sources are -src = $src -# this is src quoted for use in regexen -srcqre = `echo $src|sed -e 's@^\.$@\\\.@' -e 's@^\./$@\\\./@' -e 's@^\.\./@\\\.\\\./@g` - -# nice makes grok this -!GROK!THIS! -if $test X. != X$src; then -$spitshell >>Makefile <>Makefile <>Makefile <<'!NO!SUBS!' @@ -296,15 +281,15 @@ utilities: miniperl lib/Config.pm FORCE FORCE: @sh -c true -miniperlmain$(OBJ_EXT): $(src)/miniperlmain.c - $(CCCMD) $(PLDLFLAGS) $< +miniperlmain$(OBJ_EXT): miniperlmain.c + $(CCCMD) $(PLDLFLAGS) $*.c -perlmain.c: $(src)/miniperlmain.c config.sh $(FIRSTMAKEFILE) +perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE) sh writemain $(DYNALOADER) $(static_ext) > writemain.tmp - sh $(src)/mv-if-diff writemain.tmp perlmain.c + sh mv-if-diff writemain.tmp perlmain.c perlmain$(OBJ_EXT): perlmain.c - $(CCCMD) $(PLDLFLAGS) $< + $(CCCMD) $(PLDLFLAGS) $*.c # The file ext.libs is a list of libraries that must be linked in # for static extensions, e.g. -lm -lgdbm, etc. The individual @@ -421,7 +406,7 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT) miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs) - $(LDLIBPTH) ./miniperl -w -Ilib -I$(src)/lib -MExporter -e 0 || $(MAKE) minitest + $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) @@ -455,42 +440,33 @@ sperl$(OBJ_EXT): perl.c perly.h patchlevel.h $(h) $(CCCMD) -DIAMSUID sperl.c $(RMS) sperl.c -lib: - @sh ./makedir lib - # We have to call our ./makedir because Ultrix 4.3 make can't handle the line # test -d lib/auto || mkdir lib/auto # preplibrary: miniperl lib/Config.pm $(plextract) @sh ./makedir lib/auto @echo " AutoSplitting perl library" - $(LDLIBPTH) ./miniperl -Ilib -I$(src)/lib -e 'use AutoSplit; \ - autosplit_lib_modules(@ARGV)' $(src)/lib/*.pm $(src)/lib/*/*.pm + $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ + autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm # Take care to avoid modifying lib/Config.pm without reason # (If trying to create a new port and having problems with the configpm script, # try 'make minitest' and/or commenting out the tests at the end of configpm.) -lib/Config.pm: lib config.sh miniperl configpm +lib/Config.pm: config.sh miniperl configpm $(LDLIBPTH) ./miniperl configpm configpm.tmp - sh $(src)/mv-if-diff configpm.tmp $@ - -lib/ExtUtils: lib - @sh ./makedir lib/ExtUtils + sh mv-if-diff configpm.tmp $@ -lib/ExtUtils/Miniperl.pm: lib/ExtUtils miniperlmain.c miniperl minimod.pl lib/Config.pm +lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp - sh $(src)/mv-if-diff minimod.tmp $@ + sh mv-if-diff minimod.tmp $@ -lib/re.pm: lib $(src)/ext/re/re.pm +lib/re.pm: ext/re/re.pm rm -f $@ - cat $(src)/ext/re/re.pm > $@ - -pod: - @sh ./makedir pod - -$(plextract): pod miniperl lib/Config.pm lib/re.pm - $(LDLIBPTH) ./miniperl -Ilib -I$(src)/lib $(src)/$@.PL + cat ext/re/re.pm > $@ +$(plextract): miniperl lib/Config.pm lib/re.pm + $(LDLIBPTH) ./miniperl -Ilib $@.PL + install: all install.perl install.man install.perl: all installperl @@ -537,16 +513,13 @@ run_byacc: FORCE chmod 664 vms/perly_c.vms vms/perly_h.vms perl vms/vms_yfix.pl perly.c perly.h vms/perly_c.vms vms/perly_h.vms -perly$(OBJ_EXT): $(src)/perly.c - $(CCCMD) $(PLDLFLAGS) $(src)/perly.c - # We don't want to regenerate perly.c and perly.h, but they might # appear out-of-date after a patch is applied or a new distribution is # made. -perly.c: $(src)/perly.y +perly.c: perly.y -@sh -c true -perly.h: $(src)/perly.y +perly.h: perly.y -@sh -c true # No compat3.sym here since and including the 5.004_50. @@ -590,16 +563,16 @@ regen_headers: FORCE # DynaLoader may be needed for extensions that use Makefile.PL. $(DYNALOADER): miniperl preplibrary FORCE - @$(LDLIBPTH) sh $(src)/ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) d_dummy $(dynamic_ext): miniperl preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh $(src)/ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) s_dummy $(static_ext): miniperl preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh $(src)/ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + @$(LDLIBPTH) sh ext/util/make_ext static $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) n_dummy $(nonxs_ext): miniperl preplibrary $(DYNALOADER) FORCE - @$(LDLIBPTH) sh $(src)/ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) + @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) clean: _tidy _mopup @@ -676,8 +649,8 @@ depend: makedepend cd x2p; $(MAKE) depend # Cannot postpone this until $firstmakefile is ready ;-) -makedepend: $(src)/makedepend.SH config.sh - sh $(src)/makedepend.SH +makedepend: makedepend.SH config.sh + sh ./makedepend.SH # Cannot delegate rebuilding of t/perl to make to allow interlaced # test and minitest @@ -717,28 +690,28 @@ minitest: miniperl lib/re.pm # Please *don't* use this unless all tests pass. # If you want to report test failures, use "make nok" instead. ok: utilities - $(LDLIBPTH) ./perl -Ilib -I$(src)/lib utils/perlbug -ok -s '(UNINSTALLED)' + $(LDLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' okfile: utilities - $(LDLIBPTH) ./perl -Ilib -I$(src)/lib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok + $(LDLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok nok: utilities - $(LDLIBPTH) ./perl -Ilib -I$(src)/lib utils/perlbug -nok -s '(UNINSTALLED)' + $(LDLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' clist: $(c) - echo $(c) | tr ' ' $(TRNL) | sed -e "s@^$(srcqre)/@@" >.clist + echo $(c) | tr ' ' $(TRNL) >.clist hlist: $(h) - echo $(h) | tr ' ' $(TRNL) | sed -e "s@^$(srcqre)/@@" >.hlist + echo $(h) | tr ' ' $(TRNL) >.hlist shlist: $(sh) - echo $(sh) | tr ' ' $(TRNL) | sed -e "s@^$(srcqre)/@@" >.shlist + echo $(sh) | tr ' ' $(TRNL) >.shlist pllist: $(pl) - echo $(pl) | tr ' ' $(TRNL) | sed -e "s@^$(srcqre)/@@" >.pllist + echo $(pl) | tr ' ' $(TRNL) >.pllist -Makefile: $(src)/Makefile.SH ./config.sh - $(SHELL) $(src)/Makefile.SH +Makefile: Makefile.SH ./config.sh + $(SHELL) Makefile.SH distcheck: FORCE perl '-MExtUtils::Manifest=&fullcheck' -e 'fullcheck()' diff --git a/cflags.SH b/cflags.SH index 2aed681..54e19d5 100755 --- a/cflags.SH +++ b/cflags.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $CONFIG in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -24,7 +24,6 @@ echo "Extracting cflags (with variable substitutions)" rm -f cflags $spitshell >cflags </dev/null diff --git a/configpm b/configpm index ac7f3aa..dd9e858 100755 --- a/configpm +++ b/configpm @@ -1,15 +1,7 @@ #!./miniperl -w -# File::Spec? my $config_pm = $ARGV[0] || 'lib/Config.pm'; -my $src = '.'; -# File::Dirname? File::Spec? -if ($0 =~ m!^(?:(.+)/)configpm$!) { - $src = $1; - unshift @INC, "$1/lib"; -} -# File::Spec? -my $glossary = $ARGV[1] || "$src/Porting/Glossary"; +my $glossary = $ARGV[1] || 'Porting/Glossary'; @ARGV = "./config.sh"; # list names to put first (and hence lookup fastest) @@ -93,11 +85,7 @@ print CONFIG "\n", print CONFIG "my \$summary = <<'!END!';\n"; -# File::Spec? -my $myconfigdotSH = - $src eq "." ? "myconfig.SH" : "$src/myconfig.SH"; - -open(MYCONFIG,"<$myconfigdotSH") || die "open $myconfigdotSH failed: $!"; +open(MYCONFIG,") && !/^Summary of/; do { print CONFIG $_ } until !defined($_ = ) || /^\s*$/; close(MYCONFIG); diff --git a/ext/util/make_ext b/ext/util/make_ext index 9afbbcc..54caf7d 100644 --- a/ext/util/make_ext +++ b/ext/util/make_ext @@ -75,7 +75,7 @@ makefile=Makefile makeargs='' makeopts='' -if test ! -d "$src/ext/$pname"; then +if test ! -d "ext/$pname"; then echo " Skipping $extspec (directory does not exist)" exit 0 # not an error ? fi @@ -83,11 +83,6 @@ fi echo " Making $mname ($target)" -mkdir ext 2>/dev/null -mkdir ext/$pname 2>/dev/null -if test ! -f ext/$pname/Makefile.PL; then - cat $src/ext/$pname/Makefile.PL > ext/$pname/Makefile.PL -fi cd ext/$pname # check link type and do any preliminaries @@ -121,7 +116,7 @@ nonxs) makeargs=""; esac if test ! -f $makefile ; then - test -f Makefile.PL && ../$depth/miniperl -I../$depth/lib -I$src/lib Makefile.PL INSTALLDIRS=perl $passthru + test -f Makefile.PL && ../$depth/miniperl -I../$depth/lib Makefile.PL INSTALLDIRS=perl $passthru fi if test ! -f $makefile ; then if test -f Makefile.SH; then diff --git a/lib/AutoSplit.pm b/lib/AutoSplit.pm index eaa0691..33c0b9a 100644 --- a/lib/AutoSplit.pm +++ b/lib/AutoSplit.pm @@ -176,7 +176,7 @@ sub autosplit_lib_modules{ $dir =~ s#[\.\]]#/#g; $_ = $dir . $name; } - autosplit_file("$_", "lib/auto", + autosplit_file("lib/$_", "lib/auto", $Keep, $CheckForAutoloader, $CheckModTime); } 0; diff --git a/makedepend.SH b/makedepend.SH index e26c50e..e1c2846 100755 --- a/makedepend.SH +++ b/makedepend.SH @@ -26,14 +26,13 @@ $startsh # MAKE=$make trnl='$trnl' -src=$src !GROK!THIS! $spitshell >>makedepend <<'!NO!SUBS!' # This script should be called with -# sh ./makedepend MAKE=$(MAKE) [src=$(src)] +# sh ./makedepend MAKE=$(MAKE) case "$1" in - MAKE=*) eval $1 ; shift ;; + MAKE=*) eval $1 ;; esac export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh \$0; kill \$\$) @@ -52,10 +51,6 @@ case $CONFIGDOTSH in ;; esac -case "$1" in - src=*) eval $1 ; shift ;; -esac - # We need .. when we are in the x2p directory if we are using the # cppstdin wrapper script. # Put .. and . first so that we pick up the present cppstdin, not @@ -100,18 +95,9 @@ esac : might be identical $test -d UU || mkdir UU -$MAKE clist || (cd $src; $echo "Searching for .c files..."; \ - $echo *.c | $tr ' ' $trnl | $egrep -v '\*') >.clist -for base in `$cat .clist`; do - case "$src" in - .) file="$base" ;; - *) if test -f "$base"; then - file="$base" - elif test -f "$src/$base"; then - file="$src/$base" - fi - ;; - esac +$MAKE clist || ($echo "Searching for .c files..."; \ + $echo *.c | $tr ' ' $trnl | $egrep -v '\*' >.clist) +for file in `$cat .clist`; do # for file in `cat /dev/null`; do if [ "$osname" = uwin ]; then uwinfix="-e s,\\\\\\\\,/,g -e s,\\([a-zA-Z]\\):/,/\\1/,g" @@ -127,15 +113,14 @@ for base in `$cat .clist`; do fi fi case "$file" in + *.c) filebase=`basename $file .c` ;; + *.y) filebase=`basename $file .y` ;; + esac + case "$file" in */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;; *) finc= ;; esac - case "$src" in - '') ;; - *) finc="-I$src" ;; - esac - basebase=`basename $base .c` - $echo "Finding dependencies for $basebase$_o." + $echo "Finding dependencies for $filebase$_o." ( $echo "#line 1 \"$file\""; \ $sed -n <$file \ -e "/^${filebase}_init(/q" \ @@ -144,16 +129,16 @@ for base in `$cat .clist`; do -e 's|/\*.*$||' \ -e 's|\\$||' \ -e p \ - -e '}' ) >UU/$base.c - $cppstdin $finc -I. $cppflags $cppminus UU/$file.c + $cppstdin $finc -I. $cppflags $cppminus /d' \ -e '/^#.*"-"/d' \ -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ -e 's/^[ ]*#[ ]*line/#/' \ -e '/^# *[0-9][0-9]* *[".\/]/!d' \ - -e 's/^.*"\(.*\)".*$/'$base'\$(OBJ_EXT): \1/' \ - -e 's/^# *[0-9][0-9]* \(.*\)$/'$base'\$(OBJ_EXT): \1/' \ + -e 's/^.*"\(.*\)".*$/'$filebase'\$(OBJ_EXT): \1/' \ + -e 's/^# *[0-9][0-9]* \(.*\)$/'$filebase'\$(OBJ_EXT): \1/' \ -e 's|: \./|: |' \ -e 's|\.c\.c|.c|' $uwinfix | \ $uniq | $sort | $uniq >> .deptmp @@ -161,8 +146,8 @@ done $sed <$mf >$mf.new -e '1,/^# AUTOMATICALLY/!d' -$MAKE shlist || (cd $src; $echo "Searching for .SH files..."; \ - $echo *.SH | $tr ' ' $trnl | $egrep -v '\*') >.shlist +$MAKE shlist || ($echo "Searching for .SH files..."; \ + $echo *.SH | $tr ' ' $trnl | $egrep -v '\*' >.shlist) # Now extract the dependencies on makedepend.SH and Makefile.SH # (they should reside in the main Makefile): @@ -191,8 +176,8 @@ if $test -s .deptmp; then $sed 's|^\(.*\$(OBJ_EXT):\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" .deptmp \ >>$mf.new else - $MAKE hlist || (cd $src; $echo "Searching for .h files..."; \ - $echo *.h | $tr ' ' $trnl | $egrep -v '\*') >.hlist + $MAKE hlist || ($echo "Searching for .h files..."; \ + $echo *.h | $tr ' ' $trnl | $egrep -v '\*' >.hlist) $echo "You don't seem to have a proper C preprocessor. Using grep instead." $egrep '^#include ' `cat .clist` `cat .hlist` >.deptmp $echo "Updating $mf..." diff --git a/pod/pod2html.PL b/pod/pod2html.PL index 746e101..366dc16 100644 --- a/pod/pod2html.PL +++ b/pod/pod2html.PL @@ -2,6 +2,7 @@ use Config; use File::Basename qw(&basename &dirname); +use Cwd; # List explicitly here the variables you want Configure to # generate. Metaconfig only looks for shell variables, so you @@ -10,11 +11,13 @@ use File::Basename qw(&basename &dirname); # $startperl # to ensure Configure will look for $Config{startperl}. -$file = basename($0); -$file =~ s/\.PL$//i; +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +$origdir = cwd; +chdir dirname($0); +$file = basename($0, '.PL'); $file .= '.com' if $^O eq 'VMS'; -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; @@ -177,4 +180,4 @@ pod2html @ARGV; close OUT or die "Can't close $file: $!"; chmod 0755, $file or die "Can't reset permissions for $file: $!\n"; exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':'; - +chdir $origdir; diff --git a/pod/pod2latex.PL b/pod/pod2latex.PL index 01cdf1b..feed98e 100644 --- a/pod/pod2latex.PL +++ b/pod/pod2latex.PL @@ -2,6 +2,7 @@ use Config; use File::Basename qw(&basename &dirname); +use Cwd; # List explicitly here the variables you want Configure to # generate. Metaconfig only looks for shell variables, so you @@ -10,11 +11,13 @@ use File::Basename qw(&basename &dirname); # $startperl # to ensure Configure will look for $Config{startperl}. -$file = basename($0); -$file =~ s/\.PL$//i; +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +$origdir = cwd; +chdir dirname($0); +$file = basename($0, '.PL'); $file .= '.com' if $^O eq 'VMS'; -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; @@ -702,3 +705,4 @@ BEGIN { close OUT or die "Can't close $file: $!"; chmod 0755, $file or die "Can't reset permissions for $file: $!\n"; exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':'; +chdir $origdir; diff --git a/pod/pod2man.PL b/pod/pod2man.PL index 37557bf..20610a8 100644 --- a/pod/pod2man.PL +++ b/pod/pod2man.PL @@ -2,6 +2,7 @@ use Config; use File::Basename qw(&basename &dirname); +use Cwd; # List explicitly here the variables you want Configure to # generate. Metaconfig only looks for shell variables, so you @@ -11,11 +12,13 @@ use File::Basename qw(&basename &dirname); # $man3ext # to ensure Configure will look for $Config{startperl}. -$file = basename($0); -$file =~ s/\.PL$//i; +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +$origdir = cwd; +chdir dirname($0); +$file = basename($0, '.PL'); $file .= '.com' if $^O eq 'VMS'; -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; @@ -1231,3 +1234,4 @@ BEGIN { close OUT or die "Can't close $file: $!"; chmod 0755, $file or die "Can't reset permissions for $file: $!\n"; exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':'; +chdir $origdir; diff --git a/pod/pod2text.PL b/pod/pod2text.PL index a1a3875..94516c3 100644 --- a/pod/pod2text.PL +++ b/pod/pod2text.PL @@ -2,6 +2,7 @@ use Config; use File::Basename qw(&basename &dirname); +use Cwd; # List explicitly here the variables you want Configure to # generate. Metaconfig only looks for shell variables, so you @@ -10,11 +11,13 @@ use File::Basename qw(&basename &dirname); # $startperl # to ensure Configure will look for $Config{startperl}. -$file = basename($0); +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +$origdir = cwd; +chdir dirname($0); $file = basename($0, '.PL'); $file .= '.com' if $^O eq 'VMS'; -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; @@ -45,3 +48,4 @@ if(@ARGV) { close OUT or die "Can't close $file: $!"; chmod 0755, $file or die "Can't reset permissions for $file: $!\n"; exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':'; +chdir $origdir; diff --git a/pod/pod2usage.PL b/pod/pod2usage.PL index f534252..fdaa955 100644 --- a/pod/pod2usage.PL +++ b/pod/pod2usage.PL @@ -10,11 +10,13 @@ use File::Basename qw(&basename &dirname); # $startperl # to ensure Configure will look for $Config{startperl}. -$file = basename($0); -$file =~ s/\.PL$//i; -$file .= '.com' if $^O eq 'VMS'; +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +chdir(dirname($0)); +($file = basename($0)) =~ s/\.PL$//; +$file =~ s/\.pl$// + if ($^O eq 'VMS' or $^O eq 'os2'); # "case-forgiving" -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; diff --git a/pod/podchecker.PL b/pod/podchecker.PL index 24dcfb8..1ca0d79 100644 --- a/pod/podchecker.PL +++ b/pod/podchecker.PL @@ -10,11 +10,13 @@ use File::Basename qw(&basename &dirname); # $startperl # to ensure Configure will look for $Config{startperl}. -$file = basename($0); -$file =~ s/\.PL$//i; -$file .= '.com' if $^O eq 'VMS'; +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +chdir(dirname($0)); +($file = basename($0)) =~ s/\.PL$//; +$file =~ s/\.pl$// + if ($^O eq 'VMS' or $^O eq 'os2'); # "case-forgiving" -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; diff --git a/pod/podselect.PL b/pod/podselect.PL index 7cff691..0df8304 100644 --- a/pod/podselect.PL +++ b/pod/podselect.PL @@ -10,11 +10,13 @@ use File::Basename qw(&basename &dirname); # $startperl # to ensure Configure will look for $Config{startperl}. -$file = basename($0); -$file =~ s/\.PL$//i; -$file .= '.com' if $^O eq 'VMS'; +# This forces PL files to create target in same directory as PL file. +# This is so that make depend always knows where to find PL derivatives. +chdir(dirname($0)); +($file = basename($0)) =~ s/\.PL$//; +$file =~ s/\.pl$// + if ($^O eq 'VMS' or $^O eq 'os2'); # "case-forgiving" -chdir("pod") or die "Can't chdir to pod: $!"; open OUT,">$file" or die "Can't create $file: $!"; print "Extracting $file (with variable substitutions)\n"; diff --git a/writemain.SH b/writemain.SH index 6c53602..18544c1 100644 --- a/writemain.SH +++ b/writemain.SH @@ -24,7 +24,6 @@ echo "Extracting writemain (with variable substitutions)" rm -f writemain $spitshell >writemain <>Makefile <<'!NO!SUBS!' @@ -95,9 +89,9 @@ plm = a2p.loadmap addedbyconf = $(shextract) $(plextract) -h = EXTERN.h INTERN.h ../config.h handy.h hash.h a2p.h str.h util.h +h = EXTERN.h INTERN.h ../config.h ../handy.h hash.h a2p.h str.h util.h -c = hash.c str.c util.c walk.c +c = hash.c $(mallocsrc) str.c util.c walk.c obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT) @@ -153,7 +147,7 @@ lint: lint $(lintflags) $(defs) $(c) > a2p.fuzz depend: $(mallocsrc) ../makedepend - sh ../makedepend MAKE=$(MAKE) src=$(src)/x2p + sh ../makedepend MAKE=$(MAKE) clist: echo $(c) | tr ' ' $(TRNL) >.clist