miniperl build fixes for os2 (from Yitzchak Scott-Thoennes

[perl5.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 6693565..8eff294 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -194,6 +194,10 @@ SHELL = $sh
 # how to tr(anslate) newlines
 TRNL = '$trnl'
 
+# not used by Makefile but by installperl;
+# mentioned here so that metaconfig picks it up
+INSTALL_USR_BIN_PERL = $installusrbinperl
+
 !GROK!THIS!
 
 ## In the following dollars and backticks do not need the extra backslash.
@@ -282,6 +286,9 @@ utilities:  miniperl lib/Config.pm $(plextract) FORCE
 FORCE:
        @sh -c true
 
+opmini$(OBJ_EXT): op.c
+       $(CCCMD) $(PLDLFLAGS) -DPERL_EXTERNAL_GLOB -o opmini$(OBJ_EXT) op.c
+
 miniperlmain$(OBJ_EXT): miniperlmain.c
        $(CCCMD) $(PLDLFLAGS) $*.c
 
@@ -332,8 +339,9 @@ $(LIBPERL_NONSHR): perl$(OBJ_EXT) $(obj)
        $(RMS) $(LIBPERL_NONSHR)
        $(AR) rcu $(LIBPERL_NONSHR) perl$(OBJ_EXT) $(obj)
 
-$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT)
-       $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
+$(MINIPERL_NONSHR): $(LIBPERL_NONSHR) miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT)
+       $(CC) $(LDFLAGS) -o $(MINIPERL_NONSHR) miniperlmain$(OBJ_EXT) \
+           opmini$(OBJ_EXT) $(LIBPERL_NONSHR) $(LIBS)
 
 MINIPERLEXP            = $(MINIPERL_NONSHR)
 
@@ -415,9 +423,28 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj) $(LIBPERLEXPORT)
 # build problems but that's not obvious to the novice.
 # The Module used here must not depend on Config or any extensions.
 
-miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL)
-       $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs)
-       $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
+!NO!SUBS!
+
+       case "${osname}${osvers}" in
+       next4*)
+               $spitshell >>Makefile <<'!NO!SUBS!'
+miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
+       $(CC) -o miniperl `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \
+           miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs)
+       $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+!NO!SUBS!
+               ;;
+       *)
+               $spitshell >>Makefile <<'!NO!SUBS!'
+miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
+       $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl \
+           miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
+       $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
+!NO!SUBS!
+               ;;
+       esac
+
+       $spitshell >>Makefile <<'!NO!SUBS!'
 
 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)
@@ -477,10 +504,19 @@ lib/re.pm: ext/re/re.pm
 
 $(plextract):  miniperl lib/Config.pm lib/re.pm
        $(LDLIBPTH) ./miniperl -Ilib $@.PL
-       
+
+extra.pods: perl
+       -@test -f extra.pods && rm -f `cat extra.pods`
+       -@rm -f extra.pods
+       -@for x in `grep -l '^=[a-z]' README.*` ; do \
+           nx=`echo $$x | sed -e "s/README\.//"`; \
+           $(LNS) ../$$x "pod/perl"$$nx".pod" ; \
+           echo "pod/perl"$$nx".pod" >> extra.pods ; \
+       done
+
 install: all install.perl install.man
 
-install.perl:  all installperl
+install.perl:  all extra.pods installperl
        if [ -n "$(COMPILE)" ]; \
        then \
                cd utils; $(MAKE) compile; \
@@ -490,7 +526,7 @@ install.perl:       all installperl
        fi
        $(LDLIBPTH) ./perl installperl
 
-install.man:   all installman
+install.man:   all extra.pods installman
        $(LDLIBPTH) ./perl installman
 
 # XXX Experimental. Hardwired values, but useful for testing.
@@ -559,7 +595,7 @@ CHMOD_W = chmod +w
 # To force them to run, type
 #      make regen_headers
 regen_headers: FORCE
-       $(CHMOD_W) proto.h warning.h lib/warning.pm 
+       $(CHMOD_W) proto.h warnings.h lib/warnings.pm 
        perl keywords.pl
        perl opcode.pl
        perl embed.pl
@@ -602,7 +638,8 @@ distclean:  clobber
 # Do not 'make _mopup' directly.
 _mopup:
        rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c
-       rm -f perl.exp ext.libs
+       -@test -f extra.pods && rm -f `cat extra.pods`
+       -rm -f perl.exp ext.libs extra.pods
        -rm -f perl.export perl.dll perl.libexp perl.map perl.def
        -rm -f perl.loadmap miniperl.loadmap perl.prelmap miniperl.prelmap
        rm -f perl suidperl miniperl $(LIBPERL)