X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2FMakefile.SHs;h=6ef04e57d8fbad864418df671f0c6d49e6479484;hb=c06820fb26255c7ec0b8366ded45c6d7f2caf6b1;hp=87f0b3709324c44f9895bfa8f7868298a12c05ea;hpb=59ad941d06909cf9027c5fb10edca7d68fc7149b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index 87f0b37..6ef04e5 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -60,21 +60,18 @@ $(LIBPERL): perl.imp perl5.def libperl_override.lib
 	cp $(LIBPERL) perl.lib
 
 imp_version: $(FIRSTMAKEFILE)
-	echo $(PERL_DLL_BASE) > imp_version.tmp
-	sh mv-if-diff imp_version.tmp $@
+	echo $(PERL_DLL_BASE) > $@
 
 libperl_override.imp: os2/os2add.sym miniperl imp_version
-	./miniperl -wnle 'print "$$_\t$(PERL_DLL_BASE)\t$$_\t?"' os2/os2add.sym > tmp.imp
-	echo	'strdup	$(PERL_DLL_BASE)	Perl_strdup	?' >> tmp.imp
-	echo	'putenv	$(PERL_DLL_BASE)	Perl_putenv	?' >> tmp.imp
-	sh mv-if-diff tmp.imp $@
+	./miniperl -wnle 'print "$$_\t$(PERL_DLL_BASE)\t$$_\t?"' os2/os2add.sym > $@
+	echo	'strdup	$(PERL_DLL_BASE)	Perl_strdup	?' >> $@
+	echo	'putenv	$(PERL_DLL_BASE)	Perl_putenv	?' >> $@
 
 libperl_override.lib: libperl_override.imp
 	emximp -o $@ libperl_override.imp
 
 libperl_dllmain.imp: imp_version
-	echo	'main	$(PERL_DLL_BASE)	dll_perlmain	?' >> tmpdll.imp
-	sh mv-if-diff tmpdll.imp $@
+	echo	'main	$(PERL_DLL_BASE)	dll_perlmain	?' > $@
 
 libperl_dllmain.lib: libperl_dllmain.imp
 	emximp -o $@ libperl_dllmain.imp
@@ -207,7 +204,7 @@ installcmd :
 
 aout_obj = $(addsuffix $(AOUT_OBJ_EXT),$(basename $(obj)))
 AOUT_DYNALOADER = $(addsuffix $(AOUT_LIB_EXT),$(basename $(DYNALOADER)))
-aout_ext = $(dynamic_ext) $(AOUT_EXTRA_LIBS)
+aout_ext = $(static_ext) $(dynamic_ext) $(AOUT_EXTRA_LIBS)
 aout_static_ext = $(addsuffix $(AOUT_LIB_EXT),$(basename $(aout_ext)))
 aout_static_lib = $(addsuffix $(LIB_EXT),$(basename $(aout_ext)))
 
@@ -222,6 +219,10 @@ $(AOUT_DYNALOADER_OBJ) : $(DYNALOADER_OBJ)
 $(DYNALOADER_OBJ) : $(DYNALOADER)
 	@sh -c true
 
+# Quick hack to construct directories necessary for /*/% stuff:
+
+$(aout_static_ext) : $(static_ext) $(dynamic_ext)
+
 $(AOUT_LIBPERL) : $(aout_obj) perl$(AOUT_OBJ_EXT)
 	rm -f $@
 	$(AOUT_AR) rcu $@ perl$(AOUT_OBJ_EXT) $(aout_obj)
@@ -237,13 +238,11 @@ perlmain(AOUT_OBJ_EXT): perlmain.c
 	$(AOUT_CCCMD_DLL) $(PLDLFLAGS) -c perlmain.c
 
 # Assume that extensions are at most 4 deep (this is so with 5.8.1)
-aout_extlist: $(aout_static_ext)
-	echo lib/auto/*.a lib/auto/*/*.a lib/auto/*/*/*.a lib/auto/*/*/*/*.a | tr ' ' '\n' | grep -v '\*' > $@.tmp
-	sh mv-if-diff $@.tmp $@
+aout_extlist: $(aout_static_ext) $(AOUT_DYNALOADER)
+	echo lib/auto/*.a lib/auto/*/*.a lib/auto/*/*/*.a lib/auto/*/*/*/*.a | tr ' ' '\n' | grep -v '\*' > $@
 
 aout_perlmain.c: miniperlmain.c config.sh makefile $(static_ext_autoinit) $(aout_static_ext) writemain aout_extlist
-	sh writemain `cat aout_extlist` > aout_perlmain.tmp
-	sh mv-if-diff aout_perlmain.tmp aout_perlmain.c
+	sh writemain `cat aout_extlist` > aout_perlmain.c
 
 _preplibrary = miniperl lib/Config.pm lib/lib.pm lib/re.pm
 
@@ -288,7 +287,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
@@ -305,20 +304,19 @@ $(PERLREXX_DLL): perlrexx$(OBJ_EXT) perlrexx.def
 	$(SHRPENV) $(CC) $(SO_CLDFLAGS) $(CCDLFLAGS) -o $@ perlrexx$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LIBPERL) `cat ext.libs` $(libs) perlrexx.def
 
 perlrexx.def: miniperl $(_preplibrary)
-	echo	"LIBRARY 'perlrexx' INITINSTANCE TERMINSTANCE"	> tmp.def
-	echo	"DESCRIPTION '@#perl5-porters@perl.org:`miniperl -Ilib -MConfig -e 'print \$$]'`#@ REXX to Perl `miniperl -Ilib -MConfig -e 'print \$$Config{version}'` interface'" >> tmp.def
-	echo	"EXPORTS"					>> tmp.def
-	echo	'  "PERL"'					>> tmp.def
-	echo	'  "PERLTERM"'					>> tmp.def
-	echo	'  "PERLINIT"'					>> tmp.def
-	echo	'  "PERLEXIT"'					>> tmp.def
-	echo	'  "PERLEVAL"'					>> tmp.def
-	echo	'  "PERLLASTERROR"'				>> tmp.def
-	echo	'  "PERLEVALSUBCOMMAND"'			>> tmp.def
-	echo	'  "PERLEXPORTALL"'				>> tmp.def
-	echo	'  "PERLDROPALL"'				>> tmp.def
-	echo	'  "PERLDROPALLEXIT"'				>> tmp.def
-	sh mv-if-diff tmp.def $@
+	echo	"LIBRARY 'perlrexx' INITINSTANCE TERMINSTANCE"	> $@
+	echo	"DESCRIPTION '@#perl5-porters@perl.org:`miniperl -Ilib -MConfig -e 'print \$$]'`#@ REXX to Perl `miniperl -Ilib -MConfig -e 'print \$$Config{version}'` interface'" >> $@
+	echo	"EXPORTS"					>> $@
+	echo	'  "PERL"'					>> $@
+	echo	'  "PERLTERM"'					>> $@
+	echo	'  "PERLINIT"'					>> $@
+	echo	'  "PERLEXIT"'					>> $@
+	echo	'  "PERLEVAL"'					>> $@
+	echo	'  "PERLLASTERROR"'				>> $@
+	echo	'  "PERLEVALSUBCOMMAND"'			>> $@
+	echo	'  "PERLEXPORTALL"'				>> $@
+	echo	'  "PERLDROPALL"'				>> $@
+	echo	'  "PERLDROPALLEXIT"'				>> $@
 
 
 perlrexx$(OBJ_EXT): perlrexx.c
@@ -483,7 +481,7 @@ $d/%/Makefile.aout : miniperl_ \$(_preplibrary) \$(AOUT_EXTENSIONS_FORCE)
 done
 
 # We need to special-case OS2/DLL/DLL.a, since the recipe above will
-# try to find it in ext/OS2/DLL
+# try to find it in ext/OS2-DLL
 
 $spitshell >>Makefile <<'!NO!SUBS!'
 lib/auto/OS2/DLL/DLL.a : lib/auto/OS2/REXX/REXX.a