Detypo Pantherisms.

p4raw-id: //depot/perl@19506

diff --git a/Makefile.SH b/Makefile.SH
index 3d60f10..e97fc65 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -547,22 +547,19 @@ miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL) opmini$(OBJ_EXT)
 !NO!SUBS!
                ;;
        darwin*)
-               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
-                  ;;
+               case "$ldflags" in
+               *"-flat_namespace"*) ;;
+               *) # to allow opmini.o to override stuff in libperl.dylib
+               $spitshell >>Makefile <<!NO!SUBS!
+NAMESPACEFLAGS = -force_flat_namespace
+!NO!SUBS!
                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!
                ;;
        *)

diff --git a/hints/darwin.sh b/hints/darwin.sh
index 92963a7..a5e2c26 100644 (file)
--- a/hints/darwin.sh
+++ b/hints/darwin.sh
@@ -129,7 +129,8 @@ case "$osvers" in
 *)
   lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
   case "$ld" in
-  '') ld='MACOSX_DEPLOYMENT_TARGET=10.3 ld' ;;
+  *MACOSX_DEVELOPMENT_TARGET*) ;;
+  *) ld="MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;;
   esac
 esac
 ldlibpthname='DYLD_LIBRARY_PATH';