perl 5.003_03: x2p/Makefile.SH

Use Configure's $sh and $make_set_make.

Remove MAB stuff, since it's now in ccflags.

Keep 5.003's RCS info.

1 files changed, 9 insertions, 13 deletions

diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 260cfa4d64..bd8701b5b7 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -17,30 +17,28 @@ case "$0" in
 */*) cd `expr X$0 : 'X\(.*\)/'` ;;
 esac
 
-: ${bin_sh=/bin/sh}
-
 echo "Extracting x2p/Makefile (with variable substitutions)"
 rm -f Makefile
 cat >Makefile <<!GROK!THIS!
-# $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 1996/07/05 23:49:56 $
+# $RCSfile: Makefile.SH,v $$Revision: 4.1 $$Date: 92/08/07 18:29:07 $
 #
 # $Log:	Makefile.SH,v $
-# Revision 1.2  1996/07/05 23:49:56  gerti
-# OPENSTEP 4.0 patches
-#
 
 CC = $cc
 BYACC = $byacc
 LDFLAGS = $ldflags
 SMALL = $small
 LARGE = $large $split
-MAB = $mab
 mallocsrc = $mallocsrc
 mallocobj = $mallocobj
 shellflags = $shellflags
 
 libs = $libs
 
+$make_set_make
+# grrr
+SHELL = $sh
+
 # These variables will be used in a future version to make
 # the make file more portable to non-unix systems.
 AR = $ar
@@ -53,9 +51,6 @@ FIRSTMAKEFILE = $firstmakefile
 
 .SUFFIXES: .c \$(OBJ_EXT)
 
-# grrr
-SHELL = $bin_sh
-
 !GROK!THIS!
 
 cat >>Makefile <<'!NO!SUBS!'
@@ -86,14 +81,15 @@ obj = hash$(OBJ_EXT) $(mallocobj) str$(OBJ_EXT) util$(OBJ_EXT) walk$(OBJ_EXT)
 
 lintflags = -phbvxac
 
+
 .c$(OBJ_EXT):
-	$(CCCMD) $(MAB) -DPERL_FOR_X2P $*.c
+	$(CCCMD) -DPERL_FOR_X2P $*.c
 
 all: $(public) $(private) $(util)
 	touch all
 
 a2p: $(obj) a2p$(OBJ_EXT)
-	$(CC) $(MAB) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
+	$(CC) $(LDFLAGS) $(obj) a2p$(OBJ_EXT) $(libs) -o a2p
 
 # I now supply a2p.c with the kits, so the following section is
 # used only if you force byacc to run by saying
@@ -110,7 +106,7 @@ a2p.c: a2p.y
 	-@touch a2p.c
 
 a2p$(OBJ_EXT): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h handy.h ../config.h str.h hash.h
-	$(CCCMD) $(LARGE) $(MAB) -DPERL_FOR_X2P a2p.c
+	$(CCCMD) $(LARGE) a2p.c
 
 clean:
 	rm -f a2p *$(OBJ_EXT)