X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.SH;h=77d67b4dca528908988c378bcc31ae5ce70744e8;hb=5838c20cbc655050024f8cc4f3747da54d859745;hp=3d60f1048bccc5b30f43ce66a2e6370e3a927c56;hpb=cb3fc4263509f28c87c21a0ddac50efa1bb80122;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Makefile.SH b/Makefile.SH
index 3d60f10..77d67b4 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -105,13 +105,13 @@ true)
 	case "$osname" in
 	linux)
 		rm -f preload
-		cat <<-'EOT' > preload
-		#! /bin/sh
-		lib=$1
-		shift
-		test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
-		exec "$@"
-		EOT
+		cat <<'EOT' > preload
+#! /bin/sh
+lib=$1
+shift
+test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD"
+exec "$@"
+EOT
 		chmod 755 preload
 		ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl"
 		;;
@@ -550,19 +550,21 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
 		case "$osvers" in
 		[1-6].*) ;;
 		*) case "$ldflags" in
-		   *"-flat_namespace"*) ;;
-		   *) # to allow opmini.o to override stuff in libperl.dylib
-		      namespaceflags="-force_flat_namespace" ;;
-		   esac
-		   ;;
+		    *"-flat_namespace"*) ;;
+		    *) # to allow opmini.o to override stuff in libperl.dylib
+		$spitshell >>Makefile <<!NO!SUBS!
+NAMESPACEFLAGS = -force_flat_namespace
+!NO!SUBS!
+		       ;;
+		    esac
+		    ;;
 		esac
 		$spitshell >>Makefile <<'!NO!SUBS!'
 miniperl$(EXE_EXT): $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
 	-@rm -f miniperl.xok
-	$(CC) $(CLDFLAGS) $(namespaceflags) -o miniperl \
+	$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o miniperl \
 	    miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs)
 	$(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest
-		$spitshell >>Makefile <<'!NO!SUBS!'
 !NO!SUBS!
 		;;
 	*)