[perl-5.005.02] detect lack of /dev/tty

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

diff --git a/Makefile.SH b/Makefile.SH
index a5fa1a0..206514e 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1,5 +1,5 @@
 #! /bin/sh
-case $CONFIG in
+case $CONFIGDOTSH in
 '')
        if test -f config.sh; then TOP=.;
        elif test -f ../config.sh; then TOP=..;
@@ -43,13 +43,16 @@ true)
                # NeXT uses a different name.
                ldlibpth="DYLD_LIBRARY_PATH=`pwd`:$DYLD_LIBRARY_PATH"
                ;;
+       rhapsody*)
+               ldlibpth="DYLD_LIBRARY_PATH=`pwd`/Perl:$DYLD_LIBRARY_PATH"
+               ;;
        os2*)   # OS/2 doesn't need anything special for LD_LIBRARY_PATH.
                ldlibpth=''
                ;;
-       sunos*|freebsd[23]*)
+       sunos*)
                linklibperl="-lperl"
                ;;
-       netbsd*)
+       netbsd*|freebsd[234]*)
                linklibperl="-L. -lperl"
                ;;
        aix*)
@@ -166,7 +169,7 @@ shellflags = $shellflags
 $make_set_make
 
 # These variables may need to be manually set for non-Unix systems.
-AR = $ar
+AR = $full_ar
 EXE_EXT = $_exe
 LIB_EXT = $_a
 OBJ_EXT = $_o
@@ -205,9 +208,11 @@ shextract = Makefile cflags config.h makeaperl makedepend \
 # Files to be built with variable substitution after miniperl is
 # available.  Dependencies handled manually below (for now).
 
-pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL
+pl = pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL pod/pod2text.PL \
+       pod/pod2usage.PL pod/podchecker.PL pod/podselect.PL
 
-plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text
+plextract = pod/pod2html pod/pod2latex pod/pod2man pod/pod2text \
+       pod/pod2usage pod/podchecker pod/podselect
 
 addedbyconf = UU $(shextract) $(plextract) pstruct
 
@@ -526,29 +531,29 @@ _mopup:
 
 # Do not 'make _tidy' directly.
 _tidy:
-       -cd pod; $(MAKE) clean
-       -cd utils; $(MAKE) clean
-       -cd x2p; $(MAKE) clean
+       -cd pod; $(LDLIBPTH) $(MAKE) clean
+       -cd utils; $(LDLIBPTH) $(MAKE) clean
+       -cd x2p; $(LDLIBPTH) $(MAKE) clean
        -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
-       sh ext/util/make_ext clean $$x MAKE=$(MAKE) ; \
+       $(LDLIBPTH) sh ext/util/make_ext clean $$x MAKE=$(MAKE) ; \
        done
        rm -f testcompile compilelog
 
 # Do not 'make _cleaner' directly.
 _cleaner:
        -cd os2; rm -f Makefile
-       -cd pod; $(MAKE) realclean
-       -cd utils; $(MAKE) realclean
-       -cd x2p; $(MAKE) realclean
+       -cd pod; $(LDLIBPTH) $(MAKE) realclean
+       -cd utils; $(LDLIBPTH) $(MAKE) realclean
+       -cd x2p; $(LDLIBPTH) $(MAKE) realclean
        -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) $(nonxs_ext) ; do \
-       sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \
+       $(LDLIBPTH) sh ext/util/make_ext realclean $$x MAKE=$(MAKE) ; \
        done
        rm -f *.orig */*.orig *~ */*~ core core.perl.*.? core.miniperl.*.? perl.core miniperl.core t/core t/core.perl.*.? t/perl.core t/tmp???? t/c t/perl so_locations t/nonexistent1
        rm -rf $(addedbyconf)
        rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old
        rm -f $(private)
        rm -rf lib/auto
-       rm -f lib/.exists
+       rm -f lib/.exists lib/*/.exists
        rm -f h2ph.man pstruct
        rm -rf .config
        rm -f testcompile compilelog
@@ -590,11 +595,21 @@ makedepend: makedepend.SH config.sh
 test-prep: miniperl perl preplibrary utilities $(dynamic_ext) $(nonxs_ext)
        cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT))
 
+# Second branch is for testing without a tty or controling terminal.
+# See t/op/stat.t
 test check: test-prep
-       cd t && $(LDLIBPTH) ./perl TEST </dev/tty
+       if (true </dev/tty) >/dev/null 2>&1; then \
+         cd t && $(LDLIBPTH) ./perl TEST </dev/tty; \
+       else \
+         cd t && PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) ./perl TEST; \
+       fi
 
 utest ucheck: test-prep
-       cd t && $(LDLIBPTH) ./perl UTEST </dev/tty
+       if (true </dev/tty) >/dev/null 2>&1; then \
+         cd t && $(LDLIBPTH) ./perl UTEST </dev/tty; \
+       else \
+         cd t && PERL_SKIP_TTY_TEST=1 $(LDLIBPTH) ./perl UTEST; \
+       fi
 
 # For testing without a tty or controling terminal. See t/op/stat.t
 test-notty: test-prep
@@ -646,6 +661,9 @@ emacs/cperl-mode.elc: emacs/cperl-mode.el
 
 etags: emacs/cperl-mode.elc
        sh emacs/ptags
+       perl emacs/e2ctags.pl TAGS > tags
+
+ctags: etags
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE
 # If this runs make out of memory, delete /usr/include lines.