[dummy merge]

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 16b523d..61d2ca4 100755 (executable)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -31,15 +31,24 @@ true)
        # NeXT-4 specific stuff.  Can't we do this in the hint file?
        case "${osname}${osvers}" in
        next4*)
-               ld='libtool -dynamic -undefined warning -framework System \
-               -compatibility_version 1 -current_version $(PATCHLEVEL) \
-               -prebind -seg1addr 0x27000000 -install_name $(SHRPDIR)/$@'
+               ld=libtool
+               lddlflags="-dynamic -undefined warning -framework System \
+               -compatibility_version 1 -current_version $patchlevel \
+               -prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@"
                ;;
        sunos*|freebsd[23]*|netbsd*)
                linklibperl="-lperl"
                ;;
        aix*)
-               shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp -b noentry -lc -lm -lbsd"
+               shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
+               case "$osvers" in
+               3*)
+                       shrpldflags="$shrpldflags -e _nostart $ldflags $libs $cryptlib"
+                       ;;
+               *)
+                       shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib"
+                       ;;
+               esac
                aixinstdir=`pwd | sed 's/\/UU$//'`
                linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl"
                ;;
@@ -257,16 +266,14 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj)
                $spitshell >>Makefile <<'!NO!SUBS!'
        $(LD) $(SHRPLDFLAGS) -o $@ perl$(OBJ_EXT) $(obj)
 !NO!SUBS!
-           case "$osname" in
-           aix)
-                   $spitshell >>Makefile <<'!NO!SUBS!'
+               case "$osname" in
+               aix)
+                       $spitshell >>Makefile <<'!NO!SUBS!'
        mv $@ libperl$(OBJ_EXT)
        $(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
 !NO!SUBS!
-                     ;;
-           *)
-                     ;;
-           esac
+                       ;;
+               esac
                ;;
        *)
                $spitshell >>Makefile <<'!NO!SUBS!'
@@ -489,8 +496,15 @@ depend: makedepend
 makedepend: makedepend.SH config.sh
        sh ./makedepend.SH
 
-check test: miniperl perl preplibrary $(dynamic_ext)
-       - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) && ./perl TEST </dev/tty
+test-prep: miniperl perl preplibrary $(dynamic_ext)
+       cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT))
+
+test check: test-prep
+       cd t && ./perl TEST </dev/tty
+
+# For testing without a tty or controling terminal. See t/op/stat.t
+test-notty: test-prep
+       cd t && PERL_SKIP_TTY_TEST=1 ./perl TEST
 
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.