--- ./bin/maketd/Makefile	Sat Nov 22 22:48:35 1997
+++ ../calls-3.11/./bin/maketd/Makefile	Fri Apr 21 12:20:50 2000
@@ -1,6 +1,7 @@
 #	$Id: Makefile,v 4.0 1996/03/19 15:18:49 kb207252 Beta $
 #
 #	Meta-Makefile for %% product name %%
+SHELL = /bin/sh
 
 GEN=	main.c main.h
 SEND=	GCC.awk M4.patch Make.host README \
@@ -15,9 +16,9 @@
 
 LOOP=	-for i in `distrib -H ${HOSTS}` ; do \
 		echo $$i: ;\
-		rsh $$i -n sh -c '". /usr/local/lib/distrib/local.defs && cd ${INTO} && make DESTDIR=${DESTDIR} DEBUG=${DEBUG} $@"' ;\
+		rsh $$i -n sh -c '". /usr/local/lib/distrib/local.defs && cd ${INTO} && $(MAKE) DESTDIR=${DESTDIR} DEBUG=${DEBUG} $@"' ;\
 	done
-HERE=	distrib -E -f Make.host -m `hostname` | make -f - $@
+HERE=	distrib -E -f Make.host -m `hostname` | $(MAKE) -f - $@
 
 quit: FRC
 	echo 1>&2 "You are in the wrong place to just do a make"
--- ./bin/maketd/Make.host	Sat Nov 22 22:48:35 1997
+++ ../calls-3.11/./bin/maketd/Make.host	Fri Apr 21 12:34:14 2000
@@ -3,6 +3,7 @@
 changequote(~,+)dnl
 ~# Makefile for maketd
 #		Kevin Braunsdorf	Purdue University Computing Center
+SHELL = /bin/sh
 BIN=	${DESTDIR}/usr/local/bin
 PROG=	maketd
 
@@ -64,7 +65,7 @@
 	mkcmd std_help.m std_version.m maketd.m
 	-(cmp -s prog.c main.c || (mv prog.c main.c && echo main.c updated))
 	-(cmp -s prog.h main.h || (mv prog.h main.h && echo main.h updated))
-	rm -rf prog.[ch]
+	rm -rf prog.c prog.h
 
 +)~
 
--- ./bin/calls/Makefile	Sat Nov 22 22:48:34 1997
+++ ../calls-3.11/./bin/calls/Makefile	Fri Apr 21 11:46:50 2000
@@ -1,6 +1,7 @@
 #	$Id: Makefile,v 3.11 1997/10/25 18:23:47 ksb Exp $
 #
 #	Meta-Makefile for calls
+SHELL = /bin/sh
 
 GEN=	main.c main.h
 SEND=	INSTALL Make.host README TODO \
@@ -19,9 +20,9 @@
 
 LOOP=	-for i in `distrib -H ${HOSTS}` ; do \
 		echo $$i: ;\
-		rsh $$i -n sh -c '". /usr/local/lib/distrib/local.defs && export PATH && cd ${INTO} && make DESTDIR=${DESTDIR} DEBUG=${DEBUG} $@"' ;\
+		rsh $$i -n sh -c '". /usr/local/lib/distrib/local.defs && export PATH && cd ${INTO} && $(MAKE) DESTDIR=${DESTDIR} DEBUG=${DEBUG} $@"' ;\
 	done
-HERE=	distrib -E -f Make.host -m `hostname` | make -f - $@
+HERE=	distrib -E -f Make.host -m `hostname` | $(MAKE) -f - $@
 
 quit: FRC
 	echo 1>&2 "You are in the wrong place to just do a make"
--- ./bin/calls/Make.host	Sat Nov 22 22:48:34 1997
+++ ../calls-3.11/./bin/calls/Make.host	Fri Apr 21 12:21:52 2000
@@ -3,6 +3,7 @@
 #	kayessbee  (Kevin S Braunsdorf, Purdue, ksb@cc.purdue.edu)
 #
 # $Compile: make calls; make graph
+SHELL = /bin/sh
 
 BIN=	${DESTDIR}/usr/local/bin
 
@@ -40,7 +41,7 @@
 	mkcmd std_help.m calls.m
 	-(cmp -s prog.c main.c || (mv prog.c main.c && echo main.c updated))
 	-(cmp -s prog.h main.h || (mv prog.h main.h && echo main.h updated))
-	rm -rf prog.[ch]
+	rm -rf prog.c prog.h
 ')`
 
 graph: calls ${GEN} ${SRC} ${HDR}
--- ./bin/cdecl/gram.y	Sat Nov 22 22:48:35 1997
+++ ../calls-3.11/./bin/cdecl/gram.y	Fri Apr 21 12:14:35 2000
@@ -16,7 +16,29 @@
 char *savedtype;
 char *savedname;
 extern char *ds(), *cat();
-extern char *index(), *malloc();
+extern char *index();
+
+#if !defined(IRIX)
+#define IRIX	(defined(IRIX5)||defined(IRIX6))
+#endif
+
+#if !defined(USE_MALLOC_H)
+#define USE_MALLOC_H	(defined(PTX)||defined(NETBSD)||defined(IBMR2)||defined(SUN5)||defined(MSDOS)||defined(IRIX5)||defined(IRIX6)||defined(ULTRIX))
+#endif
+
+#if !defined(NEED_MALLOC_EXTERN)
+#define NEED_MALLOC_EXTERN	(!USE_MALLOC_H && !defined(NEXT2) && !defined(IRIX) && !defined(BSDI))
+#endif
+
+#if USE_MALLOC_H
+#include <malloc.h>
+#else
+#if NEED_MALLOC_EXTERN
+extern char *malloc(), *calloc();
+#endif
+#endif
+
+
 char prev;
 %}
 
--- ./bin/cdecl/Makefile	Sat Nov 22 22:48:35 1997
+++ ../calls-3.11/./bin/cdecl/Makefile	Wed Apr 19 13:15:23 2000
@@ -14,9 +14,9 @@
 
 LOOP=	-for i in `distrib -H ${HOSTS}` ; do \
 		echo $$i: ;\
-		rsh $$i -n sh -c '". /usr/local/lib/distrib/local.defs && cd ${INTO} && make DESTDIR=${DESTDIR} DEBUG=${DEBUG} $@"' ;\
+		rsh $$i -n sh -c '". /usr/local/lib/distrib/local.defs && cd ${INTO} && $(MAKE) DESTDIR=${DESTDIR} DEBUG=${DEBUG} $@"' ;\
 	done
-HERE=	distrib -E -f Make.host -m `hostname` | make -f - $@
+HERE=	distrib -E -f Make.host -m `hostname` | $(MAKE) -f - $@
 
 quit: FRC
 	echo 1>&2 "You are in the wrong place to just do a make"
--- ./Makefile	Sat Nov 22 22:48:34 1997
+++ ../calls-3.11/./Makefile	Fri Apr 21 11:46:07 2000
@@ -2,6 +2,7 @@
 #
 #	Makefile for calls distriburtion
 #
+SHELL = /bin/sh
 
 SUBDIR= bin/calls bin/maketd bin/cdecl
 OTHER=	README Make.host
@@ -16,7 +17,7 @@
 		echo $$i:;\
 		( cd $$i;\
 		[ -f Makefile ] || co -q Makefile;\
-		make ${MFLAGS} DEBUG="${DEBUG}" DESTDIR="${DESTDIR}" INTO="${INTO}/$$i" HOSTS="${HOSTS}" P="$P" $@; \
+		$(MAKE) ${MFLAGS} DEBUG="${DEBUG}" DESTDIR="${DESTDIR}" INTO="${INTO}/$$i" HOSTS="${HOSTS}" P="$P" $@; \
 		)\
 	done
 DEBUG=	-O
--- ./Make.host	Sat Nov 22 22:48:34 1997
+++ ../calls-3.11/./Make.host	Fri Apr 21 11:46:29 2000
@@ -2,6 +2,7 @@
 #
 #	Makefile for calls package master source
 #
+SHELL = /bin/sh
 
 SUBDIR = bin/calls bin/maketd bin/cdecl
 OTHER=	README
@@ -11,7 +12,7 @@
 		echo $$i:;\
 		(cd $$i;\
 		[ -f Makefile ] || co -q Makefile;\
-		make ${MFLAGS} DESTDIR="${DESTDIR}" INTO="${INTO}/$$i" P="$P" $@;\
+		$(MAKE) ${MFLAGS} DESTDIR="${DESTDIR}" INTO="${INTO}/$$i" P="$P" $@;\
 		cd ..;\
 		)\
 	done