Subject: Top level make problems (and others) + fixes (4 of 11 - #109)
Index:	src/*/{Makefile,.c} 2.11BSD

Description:
	The process of recompiling the complete system from sources
	does not completely succeed, there are programs not compiled,
	programs installed in the wrong place, files (objects, man pages,etc)
	which are not removed when a "make clean" is done, man pages
	not formatted, other man pages which are the wrong ones being
	installed, programs compiling with errors and so on and so forth.

	In short, most of the Makefiles and a number of sourcefiles
	in the system were in need of repair.

	Much of the credit (or blame ;-)) for the series of patches to
	follow is due to Paul Taylor (taylor@oswego.oswego.edu).  Takes
	a high amount of "patience" to do multiple top level 'make's
	on a pdp-11/73.  Thanks.

Repeat-By:
	cd /usr/src
	make all
	make install
	make clean

	After anywhere between 12 and 18 hours note the debris and errors
	left behind.

Fix:
	Apply this (#109) and the following patches (110,111,112,
	113,114,115, and 116).   A couple man pages have been moved from
	/usr/src/man into the game source hierarchy, the Makefiles have
	been changed to format the man pages.  The pdp/chess game had
	numerous compile time errors removed.  NOTE: the 'warp' game
	may require additional attention due to its complex configuration
	script.

	Some of the patches may not apply because the programs (notably
	in /usr/src/new and /usr/src/local) may not be present in the
	system (having been ported/added since the initial release of
	the system).  There was an earlier posting of these programs
	('popper', 'less', etc), if those articles are not present they
	may be obtained (along with these and previous patches) via 
	anonymous FTP to 'ftp.iipo.gtegsc.com' in the directory pub/2.11BSD.

	The patches have been grouped and split along directory boundaries.

	The contents are:

	#106	- script to remove some redundant man pages and rename
		  others to their correct resting place.

		  /usr/src/Makefile (top level makefile) patch.

		  NOTE: the choice of hostfile or nameserver is made
			only in lib/libc/Makefile now, not in both
			/usr/src/Makefile and lib/libc/Makefile

	#107	- /usr/src/bin updates.  There are two source (.c and
		  .h) updates as well as the Makefile patches.

	#108	- /usr/src/etc updates.  Several source patches are
		  included.

	#109	- /usr/src/games updates.  A couple of .c files are
		  also updated to remove compile time warnings.  NOTE:
		  before doing a top level make you will have to
		  configure 'warp' and do a 'make depend'.

	#110	- /usr/src/lib updates.  Only Makefiles are updated.

	#111	- /usr/src/local updates.  Only Makefile are updated but
		  some of the directories/programs may not exist on all
		  systems.

	#112	- /usr/src/man updates.  One man page (last.1) is updated
		  along with the Makefiles.

	#113	- /usr/src/new updates.  Some programs may not exist
		  ('tcsh') on all systems (but are available via ftp).
		  Other programs (rn, etc) may require some attention
		  if the patches do not apply cleanly.

	#114	- /usr/src/ucb updates.  The 'last' command is updated to
		  handle alternate wtmp files.  A couple other .h or .c
		  files are updated to remove compile time warning errors.

	#115	- /usr/src/usr.bin updates.  The 'struct' and 'tbl' program
		  sources receive numerous updates to remove compile time 
		  errors.  The remaining updates apply to the Makefiles.

	#116	- /usr/src/usr.lib updates.  Makefiles are fixed.
========================================================================
*** /usr/src/games/Makefile.old	Tue Jun  5 13:27:07 1990
--- /usr/src/games/Makefile	Mon Jan 18 08:55:57 1993
***************
*** 39,51 ****
  ${STD}:
  	cc ${CFLAGS} ${SEPFLAG} -o $@ $@.c
  
! install:
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	-for i in ${SCRIPT}; do \
! 		(install -c $$i.sh ${DESTDIR}/usr/games/$$i); done
  	-for i in ${STD} ${NSTD}; do \
! 		(install -s $$i ${DESTDIR}/usr/games/$$i); done
  	cat >${DESTDIR}/usr/games/lib/cfscores </dev/null
  	chmod 777 ${DESTDIR}/usr/games/lib/cfscores
  
--- 39,51 ----
  ${STD}:
  	cc ${CFLAGS} ${SEPFLAG} -o $@ $@.c
  
! install: ${STD} ${NSTD}
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	-for i in ${SCRIPT}; do \
! 		(install -c -m 755  $$i.sh ${DESTDIR}/usr/games/$$i); done
  	-for i in ${STD} ${NSTD}; do \
! 		(install -s -m 755 $$i ${DESTDIR}/usr/games/$$i); done
  	cat >${DESTDIR}/usr/games/lib/cfscores </dev/null
  	chmod 777 ${DESTDIR}/usr/games/lib/cfscores
  
*** /usr/src/games/backgammon/Makefile.old	Wed Feb 25 19:17:02 1987
--- /usr/src/games/backgammon/Makefile	Mon Jan 18 08:55:58 1993
***************
*** 43,49 ****
  	nroff -man -Tcrt backgammon.src > backgammon.doc
  
  #	Installation
! install:
  	install -s backgammon ${DESTDIR}/usr/games/backgammon
  	install -s teachgammon ${DESTDIR}/usr/games/teachgammon
  
--- 43,49 ----
  	nroff -man -Tcrt backgammon.src > backgammon.doc
  
  #	Installation
! install: all
  	install -s backgammon ${DESTDIR}/usr/games/backgammon
  	install -s teachgammon ${DESTDIR}/usr/games/teachgammon
  
*** /usr/src/games/battlestar/Makefile.old	Tue Jun  5 17:19:47 1990
--- /usr/src/games/battlestar/Makefile	Mon Jan 18 08:55:59 1993
***************
*** 20,26 ****
  DIR=		$(DESTDIR)/usr/games
  LIB=		$(DESTDIR)/usr/games/lib
  LOGFILE=	$(LIB)/battlestar.log
! MAN=		$(DESTDIR)/usr/man/man6/battlestar.6
  
  battlestar: $(OBJS)
  	cc -o battlestar ${SEPFLAG} $(OBJS) $(LIBS)
--- 20,26 ----
  DIR=		$(DESTDIR)/usr/games
  LIB=		$(DESTDIR)/usr/games/lib
  LOGFILE=	$(LIB)/battlestar.log
! MAN=		batlestar.0
  
  battlestar: $(OBJS)
  	cc -o battlestar ${SEPFLAG} $(OBJS) $(LIBS)
***************
*** 58,63 ****
--- 58,64 ----
  
  install: battlestar $(MAN) $(LOGFILE) $(STRINGFILE)
  	install -s battlestar $(DIR)/battlestar
+ 	install -m 444 -o bin -g bin  battlestar.0 ${DESTDIR}/usr/man/cat6
  
  stringfile $(STRINGFILE): battle_strings
  	install -c -m 644 battle_strings $(LIB)
***************
*** 66,73 ****
  	cp /dev/null $(LOGFILE)
  	chmod 666 $(LOGFILE)
  
! man $(MAN):
! 	-install -c battlestar.6 $(MAN)
  
  clean:
! 	rm -f $(OBJS) $(JUNKFILES) xx* mkstr battle_strings core a.out
--- 67,74 ----
  	cp /dev/null $(LOGFILE)
  	chmod 666 $(LOGFILE)
  
! man $(MAN): battlestar.6
! 	/usr/man/manroff battlestar.6 > battlestar.0
  
  clean:
! 	rm -f $(OBJS) $(JUNKFILES) xx* mkstr battle_strings core a.out ${MAN}
*** /usr/src/games/boggle/Makefile.old	Tue Jun  5 17:33:26 1990
--- /usr/src/games/boggle/Makefile	Mon Jan 18 08:56:00 1993
***************
*** 18,24 ****
  		else dict=/usr/dict/words; fi; \
  	sed -f sfile $$dict | uniq | ./comp >bogdict
  
! install:
  	install -s boggle ${DESTDIR}/usr/games/boggle
  	install -m 644 bogdict ${DESTDIR}/usr/games/lib/bogdict
  
--- 18,24 ----
  		else dict=/usr/dict/words; fi; \
  	sed -f sfile $$dict | uniq | ./comp >bogdict
  
! install: all
  	install -s boggle ${DESTDIR}/usr/games/boggle
  	install -m 644 bogdict ${DESTDIR}/usr/games/lib/bogdict
  
***************
*** 29,32 ****
  	cc ${SEPFLAG} -o comp ${CFLAGS} comp.c
  
  clean:
! 	rm -f bogdict boggle comp
--- 29,32 ----
  	cc ${SEPFLAG} -o comp ${CFLAGS} comp.c
  
  clean:
! 	rm -f bogdict boggle comp *.o
*** /usr/src/games/btlgammon/Makefile.old	Sun Aug 30 15:53:56 1987
--- /usr/src/games/btlgammon/Makefile	Mon Jan 18 08:56:02 1993
***************
*** 7,13 ****
  btlgammon: btlgammon.c
  	cc ${SEPFLAG} ${CFLAGS} -o btlgammon btlgammon.c
  
! install:
  	install -s btlgammon ${DESTDIR}/usr/games/btlgammon
  	install -c backrules ${DESTDIR}/usr/games/lib/backrules
  
--- 7,13 ----
  btlgammon: btlgammon.c
  	cc ${SEPFLAG} ${CFLAGS} -o btlgammon btlgammon.c
  
! install: btlgammon backrules
  	install -s btlgammon ${DESTDIR}/usr/games/btlgammon
  	install -c backrules ${DESTDIR}/usr/games/lib/backrules
  
*** /usr/src/games/cribbage/io.c.old	Thu May 30 19:45:27 1985
--- /usr/src/games/cribbage/io.c	Mon Jan 18 08:56:05 1993
***************
*** 22,31 ****
  # endif
  # define	CTRL(X)			('X' - 'A' + 1)
  
! # ifndef	attron
  #	define	erasechar()	_tty.sg_erase
  #	define	killchar()	_tty.sg_kill
! # endif		attron
  
  char		linebuf[ LINESIZE ];
  
--- 22,34 ----
  # endif
  # define	CTRL(X)			('X' - 'A' + 1)
  
! # ifndef	erasechar()
  #	define	erasechar()	_tty.sg_erase
+ # endif		erasechar()
+ 
+ # ifndef	killchar()
  #	define	killchar()	_tty.sg_kill
! # endif		killchar()
  
  char		linebuf[ LINESIZE ];
  
*** /usr/src/games/pdp/Makefile.old	Fri Apr 15 17:06:50 1988
--- /usr/src/games/pdp/Makefile	Mon Jan 18 08:56:06 1993
***************
*** 30,36 ****
  
  FRC:
  
! install:
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	-for i in ${NSTD}; do \
--- 30,36 ----
  
  FRC:
  
! install: ${NSTD}
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	-for i in ${NSTD}; do \
*** /usr/src/games/pdp/chess/Makefile.old	Fri Apr 15 17:09:13 1988
--- /usr/src/games/pdp/chess/Makefile	Mon Jan 18 08:56:06 1993
***************
*** 14,20 ****
  
  ${OBJ}: old.h
  
! install:
  	install -s chess ${DESTDIR}/usr/games
  #	install -c -m 644 book ${DESTDIR}/${LIBDIR}/book
  
--- 14,20 ----
  
  ${OBJ}: old.h
  
! install: chess
  	install -s chess ${DESTDIR}/usr/games
  #	install -c -m 644 book ${DESTDIR}/${LIBDIR}/book
  
*** /usr/src/games/pdp/chess/book.c.old	Tue Aug  4 04:54:29 1987
--- /usr/src/games/pdp/chess/book.c	Mon Jan 18 08:56:07 1993
***************
*** 53,65 ****
  
  booki(m)
  {
! 	int i;
! 	struct {
! 		char low;
! 		char high;
! 	};
! 	i.high = m.low;
! 	i.low = m.high;
! 	return(i);
  }
  
--- 53,68 ----
  
  booki(m)
  {
! 	union {
! 		int l;
! 		char m[2];
! 	} i, j;
! 
! 	j.l = m;
! 
! 	i.m[0] = j.m[1];
! 	i.m[1] = j.m[0];
! 
! 	return(i.l);
  }
  
*** /usr/src/games/pdp/chess/bplay.c.old	Sat May  5 00:38:50 1979
--- /usr/src/games/pdp/chess/bplay.c	Mon Jan 18 08:56:10 1993
***************
*** 9,15 ****
  	ab = 0;
  	v1 = -3000;
  	ply = 0;
! 	p1 = statl();
  	if(lmp == p1+2) {
  		abmove = p1[1];
  		lmp = p1;
--- 9,15 ----
  	ab = 0;
  	v1 = -3000;
  	ply = 0;
! 	p1 = (int *) statl();
  	if(lmp == p1+2) {
  		abmove = p1[1];
  		lmp = p1;
*** /usr/src/games/pdp/chess/play.c.old	Mon Aug  3 23:19:32 1987
--- /usr/src/games/pdp/chess/play.c	Mon Jan 18 08:56:11 1993
***************
*** 60,68 ****
  	int a, *p, *p1;
  
  loop:
! 	lmp = done();
  	a = manual();
! 	p = done();
  	p1 = p;
  	while(p1 != lmp) {
  		p1++;
--- 60,68 ----
  	int a, *p, *p1;
  
  loop:
! 	lmp = (int *) done();
  	a = manual();
! 	p = (int *) done();
  	p1 = p;
  	while(p1 != lmp) {
  		p1++;
***************
*** 149,155 ****
  	}
  	if(match("repeat")) {
  		if(amp[-1] != -1) {
! 			a = amp;
  			mantom? wremove(): bremove();
  			decrem();
  			posit(&out1, a);
--- 149,155 ----
  	}
  	if(match("repeat")) {
  		if(amp[-1] != -1) {
! 			a = (int) amp;
  			mantom? wremove(): bremove();
  			decrem();
  			posit(&out1, a);
***************
*** 226,232 ****
  		printf("Stale mate\n");
  		onhup();
  	}
! 	return(p);
  }
  
  xplay()
--- 226,232 ----
  		printf("Stale mate\n");
  		onhup();
  	}
! 	return((int)p);
  }
  
  xplay()
*** /usr/src/games/pdp/chess/wplay.c.old	Tue Aug  4 04:55:10 1987
--- /usr/src/games/pdp/chess/wplay.c	Mon Jan 18 08:56:15 1993
***************
*** 9,15 ****
  	ab = 0;
  	v1 = 3000;
  	ply = 0;
! 	p1 = statl();
  	if(lmp == p1+2) {
  		abmove = p1[1];
  		lmp = p1;
--- 9,15 ----
  	ab = 0;
  	v1 = 3000;
  	ply = 0;
! 	p1 = (int *) statl();
  	if(lmp == p1+2) {
  		abmove = p1[1];
  		lmp = p1;
*** /usr/src/games/phantasia/Makefile.old	Tue Jun  5 17:26:11 1990
--- /usr/src/games/phantasia/Makefile	Mon Jan 18 08:56:16 1993
***************
*** 93,108 ****
  phant.help:	phant.nr
  		tbl -TX phant.nr | nroff -man -Ttn300 > phant.help
  
! install:	all
! 		rm -f ${DESTDIR}/usr/games/phantasia
! 		ln -s ${DESTDIR}${DEST}/phantasia ${DESTDIR}/usr/games/phantasia
! 		-mkdir ${DESTDIR}${DEST}
! 		cp phantasia monsters phant.help ${DESTDIR}${DEST}
! 		chmod 755 ${DESTDIR}${DEST}
! 		chmod 4711 ${DESTDIR}${DEST}/phantasia
! 		chmod 644 ${DESTDIR}${DEST}/phant.help
! 		./setfiles
! 		-install -c phant.nr ${DESTDIR}/usr/man/man6/phantasia.6
  
  clean:
! 		${RM} -f *.o phantasia phant.help strings x.c xs.c setfiles
--- 93,111 ----
  phant.help:	phant.nr
  		tbl -TX phant.nr | nroff -man -Ttn300 > phant.help
  
! install:	all phantasia.0
! 	rm -f ${DESTDIR}/usr/games/phantasia
! 	ln -s ${DESTDIR}${DEST}/phantasia ${DESTDIR}/usr/games/phantasia
! 	-mkdir ${DESTDIR}${DEST}
! 	cp phantasia monsters phant.help ${DESTDIR}${DEST}
! 	chmod 755 ${DESTDIR}${DEST}
! 	chmod 4711 ${DESTDIR}${DEST}/phantasia
! 	chmod 644 ${DESTDIR}${DEST}/phant.help
! 	./setfiles
! 	install -m 444 -o bin -g bin  phantasia.0 ${DESTDIR}/usr/man/cat6
  
+ phantasia.0: phant.nr
+ 	/usr/man/manroff phant.nr > phantasia.0
+ 
  clean:
! 	${RM} -f *.o phantasia phant.help strings x.c xs.c setfiles phantasia.0
*** /usr/src/games/quiz/Makefile.old	Wed Feb 25 19:24:04 1987
--- /usr/src/games/quiz/Makefile	Mon Jan 18 08:56:17 1993
***************
*** 7,13 ****
  quiz: quiz.c
  	cc ${SEPFLAG} ${CFLAGS} -o quiz quiz.c
  
! install:
  	install -s quiz ${DESTDIR}/usr/games/quiz
  	cp -r quiz.k ${DESTDIR}/usr/games/lib
  
--- 7,13 ----
  quiz: quiz.c
  	cc ${SEPFLAG} ${CFLAGS} -o quiz quiz.c
  
! install: quiz quiz.k
  	install -s quiz ${DESTDIR}/usr/games/quiz
  	cp -r quiz.k ${DESTDIR}/usr/games/lib
  
*** /usr/src/games/rogue/Makefile.old	Thu Jun  9 20:08:31 1988
--- /usr/src/games/rogue/Makefile	Mon Jan 18 08:56:18 1993
***************
*** 13,29 ****
  #
  CFLAGS=	-O -DUNIX -DUNIX_BSD4_2
  LIBC=	/lib/libc.a
! SRCS=	curses.c hit.c init.c inventory.c level.c machdep.c main.c \
! 	message.c monster.c move.c object.c pack.c play.c random.c ring.c \
! 	room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c
! OBJS=	curses.o hit.o init.o inventory.o level.o machdep.o main.o \
! 	message.o monster.o move.o object.o pack.o play.o random.o ring.o \
! 	room.o save.o score.o spec_hit.o throw.o trap.o use.o zap.o
  
  all: rogue
  
  rogue: ${OBJS} ${LIBC}
! 	${CC} ${OBJS} -o $@ -lcurses -ltermlib
  
  clean: FRC
  	rm -f ${OBJS} core rogue
--- 13,69 ----
  #
  CFLAGS=	-O -DUNIX -DUNIX_BSD4_2
  LIBC=	/lib/libc.a
! SRCS=	curses.c	\
! 	hit.c		\
! 	init.c		\
! 	inventory.c	\
! 	level.c		\
! 	machdep.c	\
! 	main.c		\
! 	message.c	\
! 	monster.c	\
! 	move.c		\
! 	object.c	\
! 	pack.c		\
! 	play.c		\
! 	random.c	\
! 	ring.c		\
! 	room.c		\
! 	save.c		\
! 	score.c		\
! 	spec_hit.c	\
! 	throw.c		\
! 	trap.c		\
! 	use.c		\
! 	zap.c
! OBJS=	curses.o	\
! 	hit.o		\
! 	init.o		\
! 	inventory.o	\
! 	level.o		\
! 	machdep.o	\
! 	main.o		\
! 	message.o	\
! 	monster.o	\
! 	move.o		\
! 	object.o	\
! 	pack.o		\
! 	play.o		\
! 	random.o	\
! 	ring.o		\
! 	room.o		\
! 	save.o		\
! 	score.o		\
! 	spec_hit.o	\
! 	throw.o		\
! 	trap.o		\
! 	use.o		\
! 	zap.o
  
  all: rogue
  
  rogue: ${OBJS} ${LIBC}
! 	${CC} -i ${OBJS} -o $@ -lcurses -ltermlib
  
  clean: FRC
  	rm -f ${OBJS} core rogue
***************
*** 31,37 ****
  depend: FRC
  	mkdep ${CFLAGS} ${SRCS}
  
! install: FRC
  	install -s -o games -g bin -m 4700 rogue ${DESTDIR}/usr/games/hide
  	(cd ${DESTDIR}/usr/games; rm -f rogue; ln -s dm rogue; chown games.bin rogue)
  
--- 71,77 ----
  depend: FRC
  	mkdep ${CFLAGS} ${SRCS}
  
! install: rogue
  	install -s -o games -g bin -m 4700 rogue ${DESTDIR}/usr/games/hide
  	(cd ${DESTDIR}/usr/games; rm -f rogue; ln -s dm rogue; chown games.bin rogue)
  
*** /usr/src/games/rogue/rogue.h.old	Wed Nov 25 15:27:43 1987
--- /usr/src/games/rogue/rogue.h	Mon Jan 18 08:56:20 1993
***************
*** 186,192 ****
  #define next_monster next_object
  
  struct obj {				/* comment is monster meaning */
! 	unsigned long m_flags;	/* monster flags */
  	char *damage;			/* damage it does */
  	short quantity;			/* hit points to kill */
  	short ichar;			/* 'A' is for aquatar */
--- 186,192 ----
  #define next_monster next_object
  
  struct obj {				/* comment is monster meaning */
! 	long m_flags;			/* monster flags */
  	char *damage;			/* damage it does */
  	short quantity;			/* hit points to kill */
  	short ichar;			/* 'A' is for aquatar */
*** /usr/src/games/sail/Makefile.old	Wed Feb 25 19:25:01 1987
--- /usr/src/games/sail/Makefile	Fri Jan 22 23:02:53 1993
***************
*** 25,35 ****
  LOGFILE = lib/saillog
  TARGET = $(DESTDIR)/usr/games
  
! all: sail
  
  sail: $(OBJS)
  	$(CC) -o sail ${SEPFLAG} $(OBJS) $(LIBS)
  
  lint:
  	lint -z $(CFILES) -lcurses
  
--- 25,38 ----
  LOGFILE = lib/saillog
  TARGET = $(DESTDIR)/usr/games
  
! all: sail sail.0
  
  sail: $(OBJS)
  	$(CC) -o sail ${SEPFLAG} $(OBJS) $(LIBS)
  
+ sail.0:	sail.6
+ 	/usr/man/manroff sail.6 > sail.0
+ 
  lint:
  	lint -z $(CFILES) -lcurses
  
***************
*** 40,49 ****
  	sccs get $@
  
  clean:
! 	rm -f $(OBJS) $(JUNKFILES)
  
! install: sail $(TARGET)/$(LOGFILE)
  	install -s -m 4755 -o $(SAILMASTER) sail $(TARGET)/sail
  
  logfile $(TARGET)/$(LOGFILE):
  	cp /dev/null $(TARGET)/$(LOGFILE)
--- 43,53 ----
  	sccs get $@
  
  clean:
! 	rm -f $(OBJS) $(JUNKFILES) sail.0
  
! install: sail $(TARGET)/$(LOGFILE) sail.0
  	install -s -m 4755 -o $(SAILMASTER) sail $(TARGET)/sail
+ 	install -c -m 444 sail.0 ${DESTDIR}/usr/man/cat6/sail.0
  
  logfile $(TARGET)/$(LOGFILE):
  	cp /dev/null $(TARGET)/$(LOGFILE)
*** /usr/src/games/sail/pl_7.c.old	Wed May 29 16:10:30 1985
--- /usr/src/games/sail/pl_7.c	Mon Jan 18 08:56:22 1993
***************
*** 137,143 ****
  	static char buf[60];
  
  	if (ship != 0)
! 		p = sprintf(buf, p, ship->shipname, colours(ship),
  			sterncolour(ship));
  	sc_prompt = p;
  	sc_buf = "";
--- 137,143 ----
  	static char buf[60];
  
  	if (ship != 0)
! 		p = (char *) sprintf(buf, p, ship->shipname, colours(ship),
  			sterncolour(ship));
  	sc_prompt = p;
  	sc_buf = "";
*** /usr/src/games/warp/Configure.old	Sat Aug 29 14:49:39 1987
--- /usr/src/games/warp/Configure	Mon Jan 18 09:16:58 1993
***************
*** 102,108 ****
  libc=''
  libnm=''
  mansrc=''
- manext=''
  models=''
  split=''
  small=''
--- 102,107 ----
***************
*** 1640,1659 ****
  	esac
      fi
  done
- case "$mansrc" in
- *l)
-     manext=l
-     ;;
- *n)
-     manext=n
-     ;;
- *6)
-     manext=6
-     ;;
- *)
-     manext=1
-     ;;
- esac
  
  : see what memory models we can support
  case "$models" in
--- 1639,1644 ----
***************
*** 2016,2022 ****
  libc='$libc'
  libnm='$libnm'
  mansrc='$mansrc'
- manext='$manext'
  models='$models'
  split='$split'
  small='$small'
--- 2001,2006 ----
*** /usr/src/games/warp/Makefile.SH.old	Wed Aug 26 01:13:37 1987
--- /usr/src/games/warp/Makefile.SH	Mon Jan 25 19:50:04 1993
***************
*** 30,36 ****
  CC = $cc
  bin = $bin
  mansrc = $mansrc
- manext = $manext
  CFLAGS = $ccflags -O
  LDFLAGS = $ldflags
  CHOWNER = $chowner
--- 30,35 ----
***************
*** 106,112 ****
  $(h):
  	touch $@
  
! install: warp
  # won't work with csh
  	export PATH || exit 1
  	- mv $(bin)/warp $(bin)/warp.old
--- 105,111 ----
  $(h):
  	touch $@
  
! install: $(public) $(private) $(util)
  # won't work with csh
  	export PATH || exit 1
  	- mv $(bin)/warp $(bin)/warp.old
***************
*** 131,142 ****
  	- \
  if test `pwd` != $(mansrc); then \
  for page in $(manpages); do \
! cp $$page $(mansrc)/`basename $$page .man`.$(manext); \
  done; \
  fi
  
  clean:
! 	rm -f core *.o
  
  realclean:
  	rm -f warp *.o core $(addedbyconf) $(util)
--- 130,143 ----
  	- \
  if test `pwd` != $(mansrc); then \
  for page in $(manpages); do \
! /usr/man/manroff $$page > $(mansrc)/`basename $$page .man`.0; \
! chown bin.bin $(mansrc)/`basename $$page .man`.0; \
! chmod 444 $(mansrc)/`basename $$page .man`.0; \
  done; \
  fi
  
  clean:
! 	rm -f core *.o warp smap.* all sm
  
  realclean:
  	rm -f warp *.o core $(addedbyconf) $(util)
***************
*** 150,175 ****
  	lint $(lintflags) $(defs) $(c) > warp.fuzz
  
  smap.0: smp.0 sm
! 	sm <smp.0 >smap.0
  smap.1: smp.1 sm
! 	sm <smp.1 >smap.1
  smap.2: smp.2 sm
! 	sm <smp.2 >smap.2
  smap.3: smp.3 sm
! 	sm <smp.3 >smap.3
  smap.4: smp.4 sm
! 	sm <smp.4 >smap.4
  smap.5: smp.5 sm
! 	sm <smp.5 >smap.5
  smap.6: smp.6 sm
! 	sm <smp.6 >smap.6
  smap.7: smp.7 sm
! 	sm <smp.7 >smap.7
  sm: sm.c
  	cc sm.c $(SMALL) -o sm
  
  depend: makedepend
! 	makedepend
  
  clist:
  	echo $(c) | tr ' ' '\012' >.clist
--- 151,176 ----
  	lint $(lintflags) $(defs) $(c) > warp.fuzz
  
  smap.0: smp.0 sm
! 	./sm <smp.0 >smap.0
  smap.1: smp.1 sm
! 	./sm <smp.1 >smap.1
  smap.2: smp.2 sm
! 	./sm <smp.2 >smap.2
  smap.3: smp.3 sm
! 	./sm <smp.3 >smap.3
  smap.4: smp.4 sm
! 	./sm <smp.4 >smap.4
  smap.5: smp.5 sm
! 	./sm <smp.5 >smap.5
  smap.6: smp.6 sm
! 	./sm <smp.6 >smap.6
  smap.7: smp.7 sm
! 	./sm <smp.7 >smap.7
  sm: sm.c
  	cc sm.c $(SMALL) -o sm
  
  depend: makedepend
! 	./makedepend
  
  clist:
  	echo $(c) | tr ' ' '\012' >.clist
*** /usr/src/games/warp/Makefile.old	Wed Dec 25 00:08:20 1991
--- /usr/src/games/warp/Makefile	Mon Jan 25 19:50:07 1993
***************
*** 12,22 ****
  #
  CC = cc
  bin = /usr/games
! mansrc = /tmp
! manext = 1
! CFLAGS = -O -O
  LDFLAGS = 
! CHOWNER = bin
  privlib = /usr/games/lib/warp
  NDIRC = 
  NDIRO = 
--- 12,21 ----
  #
  CC = cc
  bin = /usr/games
! mansrc = /usr/man/cat6
! CFLAGS =  -O
  LDFLAGS = 
! CHOWNER = daemon
  privlib = /usr/games/lib/warp
  NDIRC = 
  NDIRO = 
***************
*** 85,91 ****
  $(h):
  	touch $@
  
! install: warp
  # won't work with csh
  	export PATH || exit 1
  	- mv $(bin)/warp $(bin)/warp.old
--- 84,90 ----
  $(h):
  	touch $@
  
! install: $(public) $(private) $(util)
  # won't work with csh
  	export PATH || exit 1
  	- mv $(bin)/warp $(bin)/warp.old
***************
*** 110,121 ****
  	- \
  if test `pwd` != $(mansrc); then \
  for page in $(manpages); do \
! cp $$page $(mansrc)/`basename $$page .man`.$(manext); \
  done; \
  fi
  
  clean:
! 	rm -f core *.o
  
  realclean:
  	rm -f warp *.o core $(addedbyconf) $(util)
--- 109,122 ----
  	- \
  if test `pwd` != $(mansrc); then \
  for page in $(manpages); do \
! /usr/man/manroff $$page > $(mansrc)/`basename $$page .man`.0; \
! chown bin.bin $(mansrc)/`basename $$page .man`.0; \
! chmod 444 $(mansrc)/`basename $$page .man`.0; \
  done; \
  fi
  
  clean:
! 	rm -f core *.o warp smap.* all sm
  
  realclean:
  	rm -f warp *.o core $(addedbyconf) $(util)