Subject: Top level make problems (and others) + fixes (8 of 11 - #113)
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 (#113) and the following patches (114,115 and 116).
	This update corrects the problems with the /usr/src/new Makefiles.
	Some of the programs may need special attention (rn, notes, etc)
	due to their complex configuration requirements.

	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/new/Makefile.old	Tue May 29 22:34:07 1990
--- /usr/src/new/Makefile	Mon Jan 25 08:58:54 1993
***************
*** 1,5 ****
--- 1,6 ----
  #
  DESTDIR=
+ MANDIR= /usr/new/man
  
  DEFS=	
  CFLAGS=	-O ${DEFS}
***************
*** 8,23 ****
  #
  # Default programs that are installed
  #
! STDINST=ansi jove l11 m11 patch traceroute la shar shortc
  
  #
  # Special purpose software that requires custom installation,
  # or may not be needed by all sites
  #
! OPTDIR=	bm checkobj crash kermit oldassn news nmcoll pathalias rcs rn notes
  
! SUBDIR=	ansi bm checkobj crash jove kermit l11 la m11 oldassn news nmcoll \
! 	patch pathalias rcs rn shar shortc
  
  all:	${STDINST}
  
--- 9,26 ----
  #
  # Default programs that are installed
  #
! STDINST=ansi bm checkobj jove l11 la m11 nmcoll ntp oldassn \
! 	patch pathalias rcs shar shortc tcsh traceroute vmsbackup
  
  #
  # Special purpose software that requires custom installation,
  # or may not be needed by all sites
  #
! OPTDIR=	crash oldassn kermit5.188 news ntp pathalias rcs rn notes nntp
  
! SUBDIR= ansi bm checkobj crash jove kermit5.188 l11 la m11 news nmcoll nntp \
! 	notes ntp oldassn patch pathalias rcs rn shar shortc tcsh \
! 	traceroute vmsbackup
  
  all:	${STDINST}
  
***************
*** 27,37 ****
  FRC:
  
  install:
  	-for i in ${STDINST}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  
  clean:
! 	for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
  
  depend:
  tags:
--- 30,45 ----
  FRC:
  
  install:
+ 	-mkdir ${MANDIR}
+ 	-chmod a+r ${MANDIR}
+ 	-for i in 1 2 3 4 5 6 7 8; do \
+ 		(mkdir ${MANDIR}/cat$$i; chmod a+r ${MANDIR}/cat$$i); done
  	-for i in ${STDINST}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
+ 	-sh /usr/src/usr.lib/makewhatis.sh ${MANDIR}
  
  clean:
! 	for i in ${SUBDIR}; do (cd $$i; make -k ${MFLAGS} clean); done
  
  depend:
  tags:
*** /usr/src/new/PORT/Makefile.old	Sat Jun  7 00:13:32 1986
--- /usr/src/new/PORT/Makefile	Mon Jan 18 09:34:43 1993
***************
*** 26,32 ****
  ${OPTDIR}: FRC
  	cd $@; make ${MFLAGS} all
  
! install:
  	-for i in ${STDINST}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  
--- 26,32 ----
  ${OPTDIR}: FRC
  	cd $@; make ${MFLAGS} all
  
! install: ${SUBDIR}
  	-for i in ${STDINST}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  
*** /usr/src/new/ansi/Makefile.old	Fri Aug 12 01:47:05 1988
--- /usr/src/new/ansi/Makefile	Fri Jan 22 21:53:17 1993
***************
*** 28,35 ****
  install: vmsprep ansitape ${MOBJ}
  	install -s ansitape ${DESTDIR}/usr/new/ansitape
  	install -s vmsprep ${DESTDIR}/usr/new/vmsprep
! 	install -c -m 444 ansitape.0 ${DESTDIR}/usr/new/man/cat1/ansitape.0
! 	install -c -m 444 vmsprep.0 ${DESTDIR}/usr/new/man/cat1/vmsprep.0
  
  clean:
  	rm -f a.out core errs makefile.bak Makefile.bak ansitape vmsprep *.0
--- 28,35 ----
  install: vmsprep ansitape ${MOBJ}
  	install -s ansitape ${DESTDIR}/usr/new/ansitape
  	install -s vmsprep ${DESTDIR}/usr/new/vmsprep
! 	install -m 444 -o bin -g bin ansitape.0 ${DESTDIR}/usr/new/man/cat1
! 	install -m 444 -o bin -g bin vmsprep.0 ${DESTDIR}/usr/new/man/cat1
  
  clean:
  	rm -f a.out core errs makefile.bak Makefile.bak ansitape vmsprep *.0
*** /usr/src/new/bm/Makefile.old	Fri Aug 12 01:47:05 1988
--- /usr/src/new/bm/Makefile	Fri Jan 22 21:55:06 1993
***************
*** 19,25 ****
  
  install: bm bm.0
  	install -s bm ${DESTDIR}/usr/new/bm
! 	install -c bm.0 ${DESTDIR}/usr/new/man/cat1/bm.0
  
  tags: ${HDRS} ${SRCS}
  	ctags $<
--- 19,25 ----
  
  install: bm bm.0
  	install -s bm ${DESTDIR}/usr/new/bm
! 	install -m 444 -o bin -g bin  bm.0 ${DESTDIR}/usr/new/man/cat1/bm.0
  
  tags: ${HDRS} ${SRCS}
  	ctags $<
*** /usr/src/new/checkobj/Makefile.old	Wed Sep  7 04:23:15 1988
--- /usr/src/new/checkobj/Makefile	Fri Jan 22 21:56:11 1993
***************
*** 4,18 ****
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: checkobj.c
  	cc ${CFLAGS} ${SEPFLAG} checkobj.c -o checkobj
  
! install: checkobj checkobj.1
  	install -s checkobj ${DESTDIR}/usr/new/checkobj
! 	/usr/man/manroff checkobj.1 >${DESTDIR}/usr/man/catn/checkobj.0
  
  clean:
! 	rm -f checkobj *.o MAKELOG
  
  depend:
  tags:
--- 4,23 ----
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: checkobj
! 
! checkobj: checkobj.c
  	cc ${CFLAGS} ${SEPFLAG} checkobj.c -o checkobj
  
! install: checkobj checkobj.0
  	install -s checkobj ${DESTDIR}/usr/new/checkobj
! 	install -c -m 444 -o bin -g bin checkobj.0 ${DESTDIR}/usr/new/man/cat1
  
+ checkobj.0: checkobj.1
+ 	/usr/man/manroff checkobj.1 > checkobj.0
+ 
  clean:
! 	rm -f checkobj *.o checkobj.0 MAKELOG
  
  depend:
  tags:
No differences encountered
*** /usr/src/new/jove/Makefile.old	Tue May 29 23:03:46 1990
--- /usr/src/new/jove/Makefile	Fri Jan 22 21:58:12 1993
***************
*** 191,228 ****
  
  # install doesn't work for Xenix (no install program)
  
! install: $(DESTDIR)$(LIBDIR) $(TEACH-JOVE) $(CMDS.DOC) $(JOVERC) \
! 	 $(PORTSRV) $(RECOVER) $(JOVE) $(TEACHJOVE) $(JOVEM) \
! 	 $(RECOVERM) $(TEACHJOVEM)
  
! $(DESTDIR)$(LIBDIR):
  	-mkdir $(DESTDIR)$(LIBDIR)
  
! $(TEACH-JOVE): doc/teach-jove
  	install -c -m 644 doc/teach-jove $(TEACH-JOVE)
  
  doc/cmds.doc:	doc/cmds.doc.nr doc/jove.4 doc/jove.5
  	nroff doc/cmds.doc.nr doc/jove.4 doc/jove.5 > doc/cmds.doc
  
! $(CMDS.DOC): doc/cmds.doc
  	install -c -m 644 doc/cmds.doc $(CMDS.DOC)
  
! $(JOVERC): doc/system.rc
  	install -c -m 644 doc/system.rc $(JOVERC)
  
! $(PORTSRV): portsrv
  	install -c -s -m 755 portsrv $(PORTSRV)
  
! $(RECOVER): recover
  	install -c -s -m 755 recover $(RECOVER)
  
! $(JOVE): xjove
  	install -c -s -m 755 xjove $(JOVE)
  
! $(TEACHJOVE): teachjove
  	install -c -s -m 755 teachjove $(TEACHJOVE)
  
! $(JOVEM): doc/jove.nr
  	@sed -e 's;TMPDIR;$(TMPDIR);' \
  	     -e 's;LIBDIR;$(LIBDIR);' \
  	     -e 's;SHELL;$(SHELL);' doc/jove.nr \
--- 191,227 ----
  
  # install doesn't work for Xenix (no install program)
  
! install: DESTDIR_LIBDIR TEACH-JOVE CMDS.DOC JOVERC PORTSRV RECOVER JOVE \
! 	TEACHJOVE JOVEM TEACHJOVEM
  
! DESTDIR_LIBDIR:
  	-mkdir $(DESTDIR)$(LIBDIR)
  
! TEACH-JOVE: doc/teach-jove
  	install -c -m 644 doc/teach-jove $(TEACH-JOVE)
  
  doc/cmds.doc:	doc/cmds.doc.nr doc/jove.4 doc/jove.5
  	nroff doc/cmds.doc.nr doc/jove.4 doc/jove.5 > doc/cmds.doc
  
! CMDS.DOC: doc/cmds.doc
  	install -c -m 644 doc/cmds.doc $(CMDS.DOC)
  
! JOVERC: doc/system.rc
  	install -c -m 644 doc/system.rc $(JOVERC)
  
! PORTSRV: portsrv
  	install -c -s -m 755 portsrv $(PORTSRV)
  
! RECOVER: recover
  	install -c -s -m 755 recover $(RECOVER)
  
! JOVE: xjove
  	install -c -s -m 755 xjove $(JOVE)
  
! TEACHJOVE: teachjove
  	install -c -s -m 755 teachjove $(TEACHJOVE)
  
! JOVEM: doc/jove.nr
  	@sed -e 's;TMPDIR;$(TMPDIR);' \
  	     -e 's;LIBDIR;$(LIBDIR);' \
  	     -e 's;SHELL;$(SHELL);' doc/jove.nr \
***************
*** 229,236 ****
  	| /usr/man/manroff \
  	> $(JOVEM)
  	chmod 444 $(JOVEM)
  
! $(TEACHJOVEM): doc/teachjove.nr
  	@sed -e 's;TMPDIR;$(TMPDIR);' \
  	     -e 's;LIBDIR;$(LIBDIR);' \
  	     -e 's;SHELL;$(SHELL);' doc/teachjove.nr \
--- 228,236 ----
  	| /usr/man/manroff \
  	> $(JOVEM)
  	chmod 444 $(JOVEM)
+ 	chown bin.bin $(JOVEM)
  
! TEACHJOVEM: doc/teachjove.nr
  	@sed -e 's;TMPDIR;$(TMPDIR);' \
  	     -e 's;LIBDIR;$(LIBDIR);' \
  	     -e 's;SHELL;$(SHELL);' doc/teachjove.nr \
***************
*** 237,242 ****
--- 237,243 ----
  	| /usr/man/manroff \
  	> $(TEACHJOVEM)
  	chmod 444 $(TEACHJOVEM)
+ 	chown bin.bin $(TEACHJOVEM)
  
  echo:
  	@echo $(C-FILES) $(HEADERS)
*** /usr/src/new/la/Makefile.old	Wed Sep  7 04:23:15 1988
--- /usr/src/new/la/Makefile	Fri Jan 22 21:58:53 1993
***************
*** 4,18 ****
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: la.c
  	cc ${CFLAGS} ${SEPFLAG} la.c -o la
  
! install: la la.1
  	install -s la ${DESTDIR}/usr/new/la
! 	/usr/man/manroff la.1 >${DESTDIR}/usr/man/catn/la.0
  
  clean:
! 	rm -f la *.o MAKELOG
  
  depend:
  tags:
--- 4,23 ----
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: la
! 
! la: la.c
  	cc ${CFLAGS} ${SEPFLAG} la.c -o la
  
! install: la la.0
  	install -s la ${DESTDIR}/usr/new/la
! 	install -c -m 444 -o bin -g bin la.0 ${DESTDIR}/usr/new/man/cat1/la.0
  
+ la.0: la.1
+ 	/usr/man/manroff la.1 > la.0
+ 
  clean:
! 	rm -f la *.o la.0 MAKELOG
  
  depend:
  tags:
*** /usr/src/new/m11/Makefile.old	Fri Aug 12 01:47:06 1988
--- /usr/src/new/m11/Makefile	Fri Jan 22 21:59:26 1993
***************
*** 37,43 ****
  install: all m11.0
  	install -s m11 ${DESTDIR}/usr/new/m11
  	install -s macxrf ${DESTDIR}/usr/new/macxrf
! 	install -c m11.0 ${DESTDIR}/usr/new/man/cat1/m11.0
  
  cmp: all
  	cmp m11	${DESTDIR}/usr/new/m11
--- 37,43 ----
  install: all m11.0
  	install -s m11 ${DESTDIR}/usr/new/m11
  	install -s macxrf ${DESTDIR}/usr/new/macxrf
! 	install -c -m 444 -o bin -g bin m11.0 ${DESTDIR}/usr/new/man/cat1/m11.0
  
  cmp: all
  	cmp m11	${DESTDIR}/usr/new/m11
*** /usr/src/new/news/Makefile.old	Mon Jun 22 15:02:44 1987
--- /usr/src/new/news/Makefile	Mon Jan 18 09:34:51 1993
***************
*** 11,17 ****
  ${SUBDIR}: FRC
  	cd $@; make ${MFLAGS}
  
! install:
  	for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  
--- 11,17 ----
  ${SUBDIR}: FRC
  	cd $@; make ${MFLAGS}
  
! install: ${SUBDIR}
  	for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  
*** /usr/src/new/news/man/Makefile.old	Wed Feb 24 10:18:09 1988
--- /usr/src/new/news/man/Makefile	Mon Jan 18 09:34:52 1993
***************
*** 6,30 ****
  #
  
  DESTDIR =
! MANDIR = /usr/local/man
  
  MANFILES = checknews.1 expire.8 getdate.3 inews.8 news.5 newsrc.5 postnews.1 \
  	readnews.1 recnews.8 sendbatch.8 sendnews.8 uurec.8 vnews.1
- NMANFILES = checknews.n expire.n getdate.n inews.n news.n newsrc.n postnews.n \
- 	readnews.n recnews.n sendbatch.n sendnews.n uurec.n vnews.n
  
! .SUFFIXES: .n .1 .3 .5 .8
  
! .1.n .3.n .5.n .8.n:
! 	cp $< $@
  
! all:
  
! install:
! 	cp *.1 $(MANDIR)/man1
! 	cp *.3 $(MANDIR)/man3
! 	cp *.5 $(MANDIR)/man5
! 	cp *.8 $(MANDIR)/man8
  
  clean:
  	rm -f $(NMANFILES)
--- 6,75 ----
  #
  
  DESTDIR =
! MANROFF= /usr/man/manroff
! MANDIR = /usr/man
  
  MANFILES = checknews.1 expire.8 getdate.3 inews.8 news.5 newsrc.5 postnews.1 \
  	readnews.1 recnews.8 sendbatch.8 sendnews.8 uurec.8 vnews.1
  
! NMANFILES = checknews.0 expire.0 getdate.0 inews.0 news.0 newsrc.0 postnews.0 \
! 	readnews.0 recnews.0 sendbatch.0 sendnews.0 uurec.0 vnews.0
  
! all: ${NMANFILES}
  
! install: ${NMANFILES}
! 	install -m 444 -o bin -g bin checknews.0 ${DESTDIR}${MANDIR}/cat1
! 	install -m 444 -o bin -g bin postnews.0 ${DESTDIR}${MANDIR}/cat1
! 	install -m 444 -o bin -g bin readnews.0 ${DESTDIR}${MANDIR}/cat1
! 	install -m 444 -o bin -g bin vnews.0 ${DESTDIR}${MANDIR}/cat1
! 	install -m 444 -o bin -g bin getdate.0 ${DESTDIR}${MANDIR}/cat3
! 	install -m 444 -o bin -g bin news.0 ${DESTDIR}${MANDIR}/cat5
! 	install -m 444 -o bin -g bin newsrc.0 ${DESTDIR}${MANDIR}/cat5
! 	install -m 444 -o bin -g bin expire.0 ${DESTDIR}${MANDIR}/cat8
! 	install -m 444 -o bin -g bin inews.0 ${DESTDIR}${MANDIR}/cat8
! 	install -m 444 -o bin -g bin recnews.0 ${DESTDIR}${MANDIR}/cat8
! 	install -m 444 -o bin -g bin sendbatch.0 ${DESTDIR}${MANDIR}/cat8
! 	install -m 444 -o bin -g bin sendnews.0 ${DESTDIR}${MANDIR}/cat8
! 	install -m 444 -o bin -g bin uurec.0 ${DESTDIR}${MANDIR}/cat8
  
! checknews.0: checknews.1
! 	${DESTDIR}/${MANROFF} checknews.1 > checknews.0
! 
! expire.0: expire.8
! 	${DESTDIR}/${MANROFF} expire.8 > expire.0
! 
! getdate.0: getdate.3
! 	${DESTDIR}/${MANROFF} getdate.3 > getdate.0
! 
! inews.0: inews.8
! 	${DESTDIR}/${MANROFF} inews.8 > inews.0
! 
! news.0: news.5
! 	${DESTDIR}/${MANROFF} news.5 > news.0
! 
! newsrc.0: newsrc.5
! 	${DESTDIR}/${MANROFF} newsrc.5 > newsrc.0
! 
! postnews.0: postnews.1
! 	${DESTDIR}/${MANROFF} postnews.1 > postnews.0
! 
! readnews.0: readnews.1
! 	${DESTDIR}/${MANROFF} readnews.1 > readnews.0
! 
! recnews.0: recnews.8
! 	${DESTDIR}/${MANROFF} recnews.8 > recnews.0
! 
! sendbatch.0: sendbatch.8
! 	${DESTDIR}/${MANROFF} sendbatch.8 > sendbatch.0
! 
! sendnews.0: sendnews.8
! 	${DESTDIR}/${MANROFF} sendnews.8 > sendnews.0
! 
! uurec.0: uurec.8
! 	${DESTDIR}/${MANROFF} uurec.8 > uurec.0
! 
! vnews.0: vnews.1
! 	${DESTDIR}/${MANROFF} vnews.1 > vnews.0
  
  clean:
  	rm -f $(NMANFILES)
*** /usr/src/new/news/src/Makefile.old	Wed Mar  9 18:40:48 1988
--- /usr/src/new/news/src/Makefile	Mon Jan 18 09:34:56 1993
***************
*** 20,34 ****
  #P=&
  
  NEWSUSR = news
! NEWSGRP = net
  SPOOLDIR = /usr/spool/news
  BATCHDIR = /usr/spool/batch
  LIBDIR = /usr/new/lib/news
! BINDIR = /usr/new/bin
  DESTDIR =
  UUXFLAGS = -r -z -n -gd
! MAXPERBATCH = 250000
! MINDISKFREE = 500
  SPOOL_DISK = /usr/spool
  
  CC = ./mkstrcc
--- 20,34 ----
  #P=&
  
  NEWSUSR = news
! NEWSGRP = news
  SPOOLDIR = /usr/spool/news
  BATCHDIR = /usr/spool/batch
  LIBDIR = /usr/new/lib/news
! BINDIR = /usr/new
  DESTDIR =
  UUXFLAGS = -r -z -n -gd
! MAXPERBATCH = 1000000000
! MINDISKFREE = 0
  SPOOL_DISK = /usr/spool
  
  CC = ./mkstrcc
*** /usr/src/new/news/src/defs.h.old	Wed Mar  9 18:40:53 1988
--- /usr/src/new/news/src/defs.h	Mon Jan 18 09:34:58 1993
***************
*** 32,43 ****
  #define WEEKS	(7*DAYS)
  /* Things that very well may require local configuration */
  #ifndef HOME
! #define ROOTID	6	/* uid of person allowed to cancel anything	*/
  #endif
  #define N_UMASK 022	/* mask for umask call, 022 for secure system	*/
  #define DFLTEXP	2*WEEKS	/* default no. of seconds to expire in		*/
  #define HISTEXP	4*WEEKS	/* default no. of seconds to forget in		*/
! #define DFLTSUB "general,all.general,duke.physics,duke.math,all.announce"	/* default subscription list	*/
  #define TMAIL	"/usr/ucb/Mail"	/* Mail program that understands -T	*/
  #define ADMSUB	"general,all.announce"	/* Mandatory subscription list	*/
  #define PAGE	"/usr/ucb/more"	/* Default pager			*/
--- 32,43 ----
  #define WEEKS	(7*DAYS)
  /* Things that very well may require local configuration */
  #ifndef HOME
! #define ROOTID	10	/* uid of person allowed to cancel anything	*/
  #endif
  #define N_UMASK 022	/* mask for umask call, 022 for secure system	*/
  #define DFLTEXP	2*WEEKS	/* default no. of seconds to expire in		*/
  #define HISTEXP	4*WEEKS	/* default no. of seconds to forget in		*/
! #define DFLTSUB "general,all.announce"	/* default subscription list	*/
  #define TMAIL	"/usr/ucb/Mail"	/* Mail program that understands -T	*/
  #define ADMSUB	"general,all.announce"	/* Mandatory subscription list	*/
  #define PAGE	"/usr/ucb/more"	/* Default pager			*/
***************
*** 68,74 ****
  #define BSD4_2		/* If you are running 4.2, 4.3, or 2.10 BSD */
  /* #define LOCKF		/* If you have the lockf() sys call */
  /* #define LOCKING		/* If you have the locking() sys call */
! #define DOGETUSER		/* Always do 'getuser' so can't fake name */
  /* #define LOGDIR		/* use the 'logdir' call on path lookups */
  /* #define MKDIRSUB		/* your system has mkdir as a syscall */
  /* #define READDIR		/* your system has readdir() in libc */
--- 68,74 ----
  #define BSD4_2		/* If you are running 4.2, 4.3, or 2.10 BSD */
  /* #define LOCKF		/* If you have the lockf() sys call */
  /* #define LOCKING		/* If you have the locking() sys call */
! /* #define DOGETUSER		/* Always do 'getuser' so can't fake name */
  /* #define LOGDIR		/* use the 'logdir' call on path lookups */
  /* #define MKDIRSUB		/* your system has mkdir as a syscall */
  /* #define READDIR		/* your system has readdir() in libc */
***************
*** 76,82 ****
  /* #define ALWAYSALIAS		/* temporary kludge for conversion */
  #define SENDMAIL "/usr/lib/sendmail" /* command line to run "sendmail" if you have it	*/
  /* #define MMDF	"/usr/mmdf/submit"	/* command line to run mmdf if you have it */
! #define MYORG	"Duke University Physics Dept.; Durham, N.C."
  				/* include your city (and state, and	*/
  				/* country, if not obvious) in MYORG,	*/
  				/* and please keep it short.		*/
--- 76,82 ----
  /* #define ALWAYSALIAS		/* temporary kludge for conversion */
  #define SENDMAIL "/usr/lib/sendmail" /* command line to run "sendmail" if you have it	*/
  /* #define MMDF	"/usr/mmdf/submit"	/* command line to run mmdf if you have it */
! #define MYORG	"Ed's Peanut Farms, Inc."
  				/* include your city (and state, and	*/
  				/* country, if not obvious) in MYORG,	*/
  				/* and please keep it short.		*/
***************
*** 86,92 ****
  /* NOTE: The following two macros replace the use of HIDDENNET */
  /* #define GENERICPATH "frooz"	/* If you are using a shared USENET/UUCP node */
  /* #define GENERICFROM "Frobozz.COM"	/* If you want generic From:-addresses */
! #define NICENESS	8	/* does a nice(NICENESS) in rnews */
  /* #define FASCIST	"all,!all.all"	/* only permit posting to certain groups */
  				/* see installation guide for details */
  /* #define SMALL_ADDRESS_SPACE	/* If your machine can't address > 32767 */
--- 86,92 ----
  /* NOTE: The following two macros replace the use of HIDDENNET */
  /* #define GENERICPATH "frooz"	/* If you are using a shared USENET/UUCP node */
  /* #define GENERICFROM "Frobozz.COM"	/* If you want generic From:-addresses */
! /* #define NICENESS	4	/* does a nice(NICENESS) in rnews */
  /* #define FASCIST	"all,!all.all"	/* only permit posting to certain groups */
  				/* see installation guide for details */
  /* #define SMALL_ADDRESS_SPACE	/* If your machine can't address > 32767 */
*** /usr/src/new/nmcoll/Makefile.old	Wed Sep  7 04:23:16 1988
--- /usr/src/new/nmcoll/Makefile	Fri Jan 22 22:00:50 1993
***************
*** 4,14 ****
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: nmcoll.sh
  
! install: nmcoll.sh nmcoll.1
  	install -c -m 755 nmcoll.sh ${DESTDIR}/usr/new/nmcoll
! 	/usr/man/manroff nmcoll.1 >${DESTDIR}/usr/man/catn/nmcoll.0
  
  clean:
  depend:
--- 4,17 ----
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: nmcoll.sh nmcoll.0
  
! install: nmcoll.sh nmcoll.0
  	install -c -m 755 nmcoll.sh ${DESTDIR}/usr/new/nmcoll
! 	install -c -m 444 -o bin -g bin nmcoll.0 ${DESTDIR}/usr/new/man/cat1
! 
! nmcoll.0: nmcoll.1
! 	/usr/man/manroff nmcoll.1 > nmcoll.0
  
  clean:
  depend:
*** /usr/src/new/nntp/doc/Makefile.old	Sat Feb  6 23:36:35 1988
--- /usr/src/new/nntp/doc/Makefile	Mon Jan 18 09:35:01 1993
***************
*** 28,37 ****
  	$(EXTRACT) getactive.dst getactive.1
  
  install: $(MANPAGES)
! 	mv nntpd.8c $(MANDIR)/man8/nntpd.8c
! 	mv mkgrdates.8c $(MANDIR)/man8/mkgrdates.8c
! 	mv getactive.1 $(MANDIR)/man1/getactive.1
! 	mv nntpxmit.1 $(MANDIR)/man1/nntpxmit.1
  
  print: $(MANPAGES)
  	$(ROFF) $(MACROS) -P$(PRINTER) nntpd.8c
--- 28,37 ----
  	$(EXTRACT) getactive.dst getactive.1
  
  install: $(MANPAGES)
! 	mv nntpd.8c ${DESTDIR}$(MANDIR)/man8/nntpd.8c
! 	mv mkgrdates.8c ${DESTDIR}$(MANDIR)/man8/mkgrdates.8c
! 	mv getactive.1 ${DESTDIR}$(MANDIR)/man1/getactive.1
! 	mv nntpxmit.1 ${DESTDIR}$(MANDIR)/man1/nntpxmit.1
  
  print: $(MANPAGES)
  	$(ROFF) $(MACROS) -P$(PRINTER) nntpd.8c
*** /usr/src/new/nntp/support/Makefile.old	Thu Feb 11 09:53:34 1988
--- /usr/src/new/nntp/support/Makefile	Mon Jan 18 09:35:01 1993
***************
*** 12,18 ****
  
  # Where these support programs will live
  
! DESTDIR	= /usr/lib/news
  
  all: mkgrdates
  
--- 12,19 ----
  
  # Where these support programs will live
  
! DESTDIR	= 
! BIN = /usr/lib/news
  
  all: mkgrdates
  
***************
*** 20,27 ****
  	$(CC) ${CFLAGS} -o mkgrdates mkgrdates.o
  
  install: mkgrdates
! 	cp mkgrdates ${DESTDIR}/mkgrdates
! 	chmod 755 ${DESTDIR}/mkgrdates
  
  lint:
  	lint mkgrdates.c
--- 21,27 ----
  	$(CC) ${CFLAGS} -o mkgrdates mkgrdates.o
  
  install: mkgrdates
! 	install -s -m  755 ${DESTDIR}${BIN}/mkgrdates
  
  lint:
  	lint mkgrdates.c
*** /usr/src/new/notes/Makefile.old	Tue Mar 10 09:09:49 1987
--- /usr/src/new/notes/Makefile	Mon Jan 18 09:35:04 1993
***************
*** 8,14 ****
  #	Define the Source files
  #
  SRC=	Makefile Answer.this README HINTS
! SUBDIR=	doc man src utility Samples
  
  #
  #	Some directories and commands
--- 8,14 ----
  #	Define the Source files
  #
  SRC=	Makefile Answer.this README HINTS
! SUBDIR=	doc man src Samples
  
  #
  #	Some directories and commands
***************
*** 25,31 ****
  all:	$(SUBDIR)
  	for i in ${SUBDIR}; do (cd $$i; echo $$i; make ${MFLAGS} all); done;
  
! install:
  	for i in ${SUBDIR}; do (cd $$i; echo $$i; make ${MFLAGS} install); done;
  
  clean:
--- 25,31 ----
  all:	$(SUBDIR)
  	for i in ${SUBDIR}; do (cd $$i; echo $$i; make ${MFLAGS} all); done;
  
! install: ${SUBDIR}
  	for i in ${SUBDIR}; do (cd $$i; echo $$i; make ${MFLAGS} install); done;
  
  clean:
*** /usr/src/new/notes/man/Makefile.old	Mon Jun 23 06:00:39 1986
--- /usr/src/new/notes/man/Makefile	Fri Jan 22 22:18:56 1993
***************
*** 18,24 ****
  	   nfdump.8 nfload.8 nfadmin.8
  FILES	= $(SEC1) $(SEC3) $(SEC8)
  OTHERS	= Makefile getdate.3 rscript
! MAN	= /usr/man
  TROFF=	rditroff3
  
  all:
--- 18,24 ----
  	   nfdump.8 nfload.8 nfadmin.8
  FILES	= $(SEC1) $(SEC3) $(SEC8)
  OTHERS	= Makefile getdate.3 rscript
! MAN	= /usr/new/man
  TROFF=	rditroff3
  
  all:
*** /usr/src/new/ntp/man/Makefile.old	Tue Jul 25 13:18:04 1989
--- /usr/src/new/ntp/man/Makefile	Fri Jan 22 22:16:41 1993
***************
*** 1,14 ****
! MANDIR=/usr/local/man/cat8
  
! all:;
  
! install:
! 	/usr/man/manroff ntpd.8 > /usr/new/man/cat8/ntpd.0
! 	/usr/man/manroff ntp.8 >/usr/new/man/cat8/ntp.0
! 	/usr/man/manroff ntpdc.8 >/usr/new/man/cat8/ntpdc.0
! 	/bin/chmod a=r /usr/new/man/cat8/ntpd.0
! 	/bin/chmod a=r /usr/new/man/cat8/ntp.0
! 	/bin/chmod a=r /usr/new/man/cat8/ntpdc.0
  
  clean:
! 	@rm -f *~
--- 1,19 ----
! DESTDIR=
! MANDIR=/usr/new/man/cat8
! MANSRC= ntp.8 ntpd.8 ntpdc.8
! MAN= ntp.0 ntpd.0 ntpdc.0
  
! .SUFFIXES: .8 .0
!  
! .8.0:
! 	${DESTDIR}/usr/man/manroff $*.8 > $*.0
  
! all: ${MAN}
  
+ install: ${MAN}
+ 	install -c -m 444 -o bin -g bin ntp.0 ${DESTDIR}/${MANDIR}
+ 	install -c -m 444 -o bin -g bin ntpd.0 ${DESTDIR}/${MANDIR}
+ 	install -c -m 444 -o bin -g bin ntpdc.0 ${DESTDIR}/${MANDIR}
+ 
  clean:
! 	@rm -f *~ ${MAN}
*** /usr/src/new/oldassn/Makefile.old	Wed Sep  7 04:23:16 1988
--- /usr/src/new/oldassn/Makefile	Fri Jan 22 22:02:10 1993
***************
*** 4,20 ****
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: oldassn.l
  	lex oldassn.l
  	cc ${CFLAGS} ${SEPFLAG} -w -o oldassn lex.yy.c
  	rm lex.yy.c
  
! install: oldassn oldassn.1
  	install -s oldassn ${DESTDIR}/usr/new/oldassn
! 	/usr/man/manroff oldassn.1 >${DESTDIR}/usr/man/catn/oldassn.0
  
  clean:
! 	rm -f oldassn *.o lex.yy.c MAKELOG
  
  depend:
  tags:
--- 4,25 ----
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: oldassn
! 
! oldassn: oldassn.l
  	lex oldassn.l
  	cc ${CFLAGS} ${SEPFLAG} -w -o oldassn lex.yy.c
  	rm lex.yy.c
  
! install: oldassn oldassn.0
  	install -s oldassn ${DESTDIR}/usr/new/oldassn
! 	install -c -m 444 -o bin -g bin oldassn.0 ${DESTDIR}/usr/new/man/cat1
  
+ oldassn.0: oldassn.1
+ 	/usr/man/manroff oldassn.1 > oldassn.0
+ 
  clean:
! 	rm -f oldassn *.o lex.yy.c MAKELOG oldassn.0
  
  depend:
  tags:
*** /usr/src/new/patch/Makefile.old	Fri Aug 12 01:47:06 1988
--- /usr/src/new/patch/Makefile	Fri Jan 22 22:02:26 1993
***************
*** 9,18 ****
  SRCS=	patch.c pch.c inp.c util.c version.c
  OBJS=	patch.o pch.o inp.o util.o version.o
  
! .SUFFIXES: .1 .0
  
! .1.0:
! 	/usr/man/manroff $*.1 > $*.0
  
  patch: ${OBJS}
  	cc ${SEPFLAG} ${OBJS} -o patch
--- 9,18 ----
  SRCS=	patch.c pch.c inp.c util.c version.c
  OBJS=	patch.o pch.o inp.o util.o version.o
  
! .SUFFIXES: .man .0
  
! .man.0:
! 	/usr/man/manroff $*.man > $*.0
  
  patch: ${OBJS}
  	cc ${SEPFLAG} ${OBJS} -o patch
***************
*** 19,25 ****
  
  install: patch patch.0
  	install patch ${DESTDIR}/usr/new
! 	install -m 444 patch.0 ${DESTDIR}/usr/new/man/cat1
  
  clean:
  	rm -f *.o *.orig core tags patch *.0
--- 19,25 ----
  
  install: patch patch.0
  	install patch ${DESTDIR}/usr/new
! 	install -m 444 -o bin -g bin patch.0 ${DESTDIR}/usr/new/man/cat1
  
  clean:
  	rm -f *.o *.orig core tags patch *.0
*** /usr/src/new/patch/dist/config.sh.old	Wed Aug 10 23:56:47 1988
--- /usr/src/new/patch/dist/config.sh	Mon Jan 18 09:35:09 1993
***************
*** 44,50 ****
  cpp='/lib/cpp'
  Log='$Log'
  Header='$Header'
! bin='/usr/new/bin'
  cc='cc'
  contains='grep'
  cppstdin='/lib/cpp'
--- 44,50 ----
  cpp='/lib/cpp'
  Log='$Log'
  Header='$Header'
! bin='/usr/new'
  cc='cc'
  contains='grep'
  cppstdin='/lib/cpp'
*** /usr/src/new/pathalias/Makefile.old	Fri Aug 12 01:47:06 1988
--- /usr/src/new/pathalias/Makefile	Fri Jan 22 22:03:54 1993
***************
*** 69,76 ****
  	lint makedb.c
  	lint arpatxt.c
  
! install:
  	install -s pathalias ${DESTDIR}/usr/new
  	install -s makedb ${DESTDIR}/usr/new
  	install -s arpatxt ${DESTDIR}/usr/new
! 	install -c -m 644 pathalias.0 ${DESTDIR}/usr/new/man/cat1/pathalias.0
--- 69,76 ----
  	lint makedb.c
  	lint arpatxt.c
  
! install: pathalias makedb arpatxt pathalias.0
  	install -s pathalias ${DESTDIR}/usr/new
  	install -s makedb ${DESTDIR}/usr/new
  	install -s arpatxt ${DESTDIR}/usr/new
! 	install -c -m 444 -o bin -g bin pathalias.0 ${DESTDIR}/usr/new/man/cat1
*** /usr/src/new/rcs/man/Makefile.old	Sat Jul  9 11:07:56 1988
--- /usr/src/new/rcs/man/Makefile	Fri Jan 22 22:10:06 1993
***************
*** 37,43 ****
  clean: FRC
  	rm -f ${OBJS}
  
! install: FRC
  	install -c -o bin -g bin -m 444 ${OBJS1} ${DESTDIR}/usr/new/man/cat1
  	install -c -o bin -g bin -m 444 ${OBJS5} ${DESTDIR}/usr/new/man/cat5
  
--- 37,43 ----
  clean: FRC
  	rm -f ${OBJS}
  
! install: ${OBJS1} ${OBJS5}
  	install -c -o bin -g bin -m 444 ${OBJS1} ${DESTDIR}/usr/new/man/cat1
  	install -c -o bin -g bin -m 444 ${OBJS5} ${DESTDIR}/usr/new/man/cat5
  
*** /usr/src/new/rn/Makefile.SH.old	Sat May 27 22:33:08 1989
--- /usr/src/new/rn/Makefile.SH	Mon Jan 18 09:35:19 1993
***************
*** 118,124 ****
  fi
  
  clean:
! 	rm -f *.o
  
  realclean:
  	rm -f rn *.o core $(addedbyconf) $(NNTPSRC)/common/clientlib.o
--- 118,124 ----
  fi
  
  clean:
! 	rm -f *.o rn core getactive
  
  realclean:
  	rm -f rn *.o core $(addedbyconf) $(NNTPSRC)/common/clientlib.o
*** /usr/src/new/rn/Makefile.old	Wed Jun 10 14:06:23 1992
--- /usr/src/new/rn/Makefile	Mon Jan 18 09:35:18 1993
***************
*** 111,117 ****
  fi
  
  clean:
! 	rm -f *.o
  
  realclean:
  	rm -f rn *.o core $(addedbyconf) $(NNTPSRC)/common/clientlib.o
--- 111,117 ----
  fi
  
  clean:
! 	rm -f *.o rn core getactive
  
  realclean:
  	rm -f rn *.o core $(addedbyconf) $(NNTPSRC)/common/clientlib.o
*** /usr/src/new/shar/Makefile.old	Fri Aug 12 01:47:06 1988
--- /usr/src/new/shar/Makefile	Fri Jan 22 22:07:52 1993
***************
*** 22,28 ****
  
  install: shar shar.0
  	install -s shar ${DESTDIR}/usr/new/shar
! 	install -c shar.0 ${DESTDIR}/usr/new/man/cat1/shar.0
  
  tags: ${SRCS}
  	ctags $<
--- 22,28 ----
  
  install: shar shar.0
  	install -s shar ${DESTDIR}/usr/new/shar
! 	install -c -m 444 -o bin -g bin shar.0 ${DESTDIR}/usr/new/man/cat1
  
  tags: ${SRCS}
  	ctags $<
*** /usr/src/new/shortc/Makefile.old	Sun Jul 23 12:56:17 1989
--- /usr/src/new/shortc/Makefile	Fri Jan 22 22:13:59 1993
***************
*** 4,18 ****
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: shortc.c
  	cc ${CFLAGS} ${SEPFLAG} shortc.c -o shortc
  
! install: shortc shortc.1
  	install -s shortc ${DESTDIR}/usr/new/shortc
! 	/usr/man/manroff shortc.1 >${DESTDIR}/usr/new/man/cat1/shortc.0
  
  clean:
! 	rm -f shortc *.o MAKELOG
  
  depend:
  tags:
--- 4,23 ----
  CFLAGS=	-O ${DEFS}
  SEPFLAG=-i
  
! all: shortc
! 
! shortc:shortc.c
  	cc ${CFLAGS} ${SEPFLAG} shortc.c -o shortc
  
! install: shortc shortc.0
  	install -s shortc ${DESTDIR}/usr/new/shortc
! 	install -m 444 -o bin -g bin shortc.0 ${DESTDIR}/usr/new/man/cat1
  
+ shortc.0: shortc.1
+ 	/usr/man/manroff shortc.1 > shortc.0
+ 
  clean:
! 	rm -f shortc shortc.0 *.o MAKELOG
  
  depend:
  tags:
*** /usr/src/new/tcsh/Makefile.old	Sun Dec  1 07:36:29 1991
--- /usr/src/new/tcsh/Makefile	Tue Jan 19 20:37:17 1993
***************
*** 100,108 ****
  PARALLEL=12				# Make the multi-max run fast.
  #P=&					# Use Sequent's parallel make
  P=
! DESTDIR=/bin
  MANSECT=1
! DESTMAN=/usr/local/man/man${MANSECT}
  FTPAREA=/usr/spool/ftp
  
  ASSRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
--- 100,111 ----
  PARALLEL=12				# Make the multi-max run fast.
  #P=&					# Use Sequent's parallel make
  P=
! DESTDIR=
! BINDIR=/bin
! CATSECT=0
  MANSECT=1
! DESTMAN=/usr/man/man${MANSECT}
! DESTCAT=/usr/man/cat${MANSECT}
  FTPAREA=/usr/spool/ftp
  
  ASSRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
***************
*** 178,211 ****
  mkprstr:  mkprstr.c
  	${CC} -O -o  mkprstr  mkprstr.c
  
! # Using 16k overlays.
! # Using 24576-byte base, without libraries.
  
! BASE=	sh.err.o sh.misc.o glob.o sh.hist.o sh.print.o sh.time.o	\
! 	tw.help.o tw.init.o tw.spell.o ed.defns.o ed.inputl.o ed.xmap.o	\
! 	ed.init.o tc.disc.o tc.printf.o tc.sched.o tc.vers.o tc.os.o	\
! 	tc.prompt.o tc.who.o \
! 	${PRINT} ${ALLOC} ${ERROBJ} ${STRINGS}
! # 22500 bytes.
  
! OV1=	sh.o sh.sem.o sh.char.o sh.dir.o sh.init.o \
! 	tc.const.o tc.sig.o tc.str.o 
! # 14924 bytes.
  
! OV2=	sh.func.o sh.dol.o sh.exec.o sh.parse.o 
! # 16244 bytes.
  
! OV3=	sh.glob.o sh.lex.o sh.set.o 
! # 16290 bytes.
  
! OV4=	sh.proc.o sh.exp.o ed.screen.o 
! # 15172 bytes.
  
! OV5=	tw.parse.o ed.refresh.o tc.bind.o 
! # 16086 bytes.
  
! OV6=	ed.chared.o tc.func.o 
! # 14490 bytes.
  
  tcsh: $(OBJS)
  	rm -f $@
--- 181,247 ----
  mkprstr:  mkprstr.c
  	${CC} -O -o  mkprstr  mkprstr.c
  
! BASE=			\
! 	${ALLOC}	\
! 	${ERROBJ}	\
! 	${STRINGS}	\
! 	ed.defns.o	\
! 	ed.init.o	\
! 	ed.inputl.o	\
! 	ed.xmap.o	\
! 	glob.o		\
! 	sh.char.o	\
! 	sh.err.o	\
! 	sh.exp.o	\
! 	sh.hist.o	\
! 	sh.init.o	\
! 	sh.misc.o	\
! 	sh.print.o	\
! 	sh.time.o	\
! 	tc.const.o	\
! 	tc.disc.o	\
! 	tc.os.o		\
! 	tc.printf.o	\
! 	tc.sched.o	\
! 	tc.sig.o	\
! 	tc.str.o	\
! 	tc.who.o	\
! 	tc.vers.o	\
! 	tw.help.o	\
! 	tw.init.o	\
! 	tw.spell.o
  
! OV1=			\
! 	ed.chared.o	\
! 	ed.refresh.o	\
! 	sh.dol.o
  
! OV2=			\
! 	ed.screen.o	\
! 	sh.dir.o	\
! 	sh.exec.o	\
! 	sh.parse.o
  
! OV3=			\
! 	sh.func.o	\
! 	tw.parse.o
  
! OV4=			\
! 	sh.lex.o	\
! 	sh.o
  
! OV5=			\
! 	sh.proc.o	\
! 	sh.sem.o	\
! 	sh.set.o	\
! 	tc.prompt.o
  
! OV6=			\
! 	sh.glob.o	\
! 	tc.bind.o	\
! 	tc.func.o
  
! OV7=
  
  tcsh: $(OBJS)
  	rm -f $@
***************
*** 212,218 ****
  	/bin/ld -i -X -o tcsh /lib/crt0.o \
  	$(BASE) \
  	-Z $(OV1) -Z $(OV2) -Z $(OV3) -Z $(OV4) \
! 	-Z $(OV5) -Z $(OV6) \
  	-Y -ltermcap -lc
  	@-size $@
  
--- 248,254 ----
  	/bin/ld -i -X -o tcsh /lib/crt0.o \
  	$(BASE) \
  	-Z $(OV1) -Z $(OV2) -Z $(OV3) -Z $(OV4) \
! 	-Z $(OV5) -Z $(OV6) -Z $(OV7) \
  	-Y -ltermcap -lc
  	@-size $@
  
***************
*** 247,253 ****
  	${CC} ${CF} xs.c
  	mv -f xs.o strings.o
  	rm -f xs.c
! 	
  ed.init.o: ed.init.c
  	${CC} -E ${CFLAGS} $*.c | ${XSTR} ${CF} -
  	${CC} -R ${CF} ${CF} x.c 
--- 283,289 ----
  	${CC} ${CF} xs.c
  	mv -f xs.o strings.o
  	rm -f xs.c
! 
  ed.init.o: ed.init.c
  	${CC} -E ${CFLAGS} $*.c | ${XSTR} ${CF} -
  	${CC} -R ${CF} ${CF} x.c 
***************
*** 317,329 ****
  	@for i in *.c; do vgrind -t -h "C Shell" $$i >/crp/bill/csh/$$i.t; done
  	@vgrind -t -x -h Index index >/crp/bill/csh/index.t
  
! install: tcsh 
! 	-mv  ${DESTDIR}/tcsh  ${DESTDIR}/tcsh.old
! 	cp tcsh ${DESTDIR}/tcsh
! 	strip ${DESTDIR}/tcsh
! 	cp ${STRINGFILE} ${STRINGDIR}
! 	chmod 644 ${STRINGFILE}
! 	chmod 555 ${DESTDIR}/tcsh
  
  manpage: tcsh.man
  	cp tcsh.man ${DESTMAN}/tcsh.${MANSECT}
--- 353,366 ----
  	@for i in *.c; do vgrind -t -h "C Shell" $$i >/crp/bill/csh/$$i.t; done
  	@vgrind -t -x -h Index index >/crp/bill/csh/index.t
  
! install: tcsh  tcsh.${CATSECT}
! 	-mv -f ${DESTDIR}${BINDIR}/tcsh  ${DESTDIR}${BINDIR}/tcsh.old
! 	install -s -m 555 -o bin -g bin tcsh ${DESTDIR}${BINDIR}/tcsh
! 	install -c -m 444 -o bin -g bin  ${STRINGFILE} ${DESTDIR}${STRINGDIR}
! 	install -m 444 -o bin -g bin tcsh.${CATSECT} ${DESTDIR}${DESTCAT}
! 
! tcsh.${CATSECT}:  tcsh.man
! 	/usr/man/manroff tcsh.man > tcsh.${CATSECT}
  
  manpage: tcsh.man
  	cp tcsh.man ${DESTMAN}/tcsh.${MANSECT}
*** /usr/src/new/traceroute/Makefile.old	Thu May 17 13:08:31 1990
--- /usr/src/new/traceroute/Makefile	Fri Jan 22 22:15:38 1993
***************
*** 5,12 ****
  traceroute: traceroute.c
  	cc $(CFLAGS) $(INCL) -o traceroute traceroute.c $(LIBS)
  
! install: traceroute
  	install -s -o root -g bin -m 4551 traceroute ${DESTDIR}/etc/traceroute 
  
  lint:
  	lint -b -h -x $(INCL) traceroute.c | \
--- 5,19 ----
  traceroute: traceroute.c
  	cc $(CFLAGS) $(INCL) -o traceroute traceroute.c $(LIBS)
  
! install: traceroute traceroute.0
  	install -s -o root -g bin -m 4551 traceroute ${DESTDIR}/etc/traceroute 
+ 	install -m 444 -o bin -g bin traceroute.0 ${DESTDIR}/usr/new/man/cat8
+ 
+ traceroute.0: traceroute.8
+ 	/usr/man/manroff traceroute.8 > traceroute.0
+ 
+ clean:
+ 	rm -f *.o traceroute traceroute.0 core
  
  lint:
  	lint -b -h -x $(INCL) traceroute.c | \
*** /usr/src/new/vmsbackup/Makefile.old	Wed May 31 15:03:37 1989
--- /usr/src/new/vmsbackup/Makefile	Fri Jan 22 22:14:38 1993
***************
*** 7,21 ****
  MODE=755
  BINDIR=/usr/new
  MANDIR=/usr/new/man/cat1
  
  #
  vmsbackup: vmsbackup.o match.o
  	cc $(LFLAGS) -o vmsbackup vmsbackup.o match.o $(LIBS)
! install:
! 	install -m $(MODE) -o $(OWNER) -s vmsbackup $(BINDIR)	
! 	install -c -m 0444 vmsbackup.0 $(MANDIR)
  clean:
! 	rm -f vmsbackup *.o core
  shar:
  	shar -a README vmsbackup.1 Makefile vmsbackup.c match.c \
  	    > vmsbackup.shar
--- 7,29 ----
  MODE=755
  BINDIR=/usr/new
  MANDIR=/usr/new/man/cat1
+ MAN=	vmsbackup.0
+ MANSRC=	vmsbackup.1
  
  #
  vmsbackup: vmsbackup.o match.o
  	cc $(LFLAGS) -o vmsbackup vmsbackup.o match.o $(LIBS)
! 
! install: vmsbackup $(MAN)
! 	install -m $(MODE) -o $(OWNER) -s vmsbackup ${DESTDIR}$(BINDIR)	
! 	install -c -m 0444 -o bin -g bin vmsbackup.0 ${DESTDIR}$(MANDIR)
! 
! vmsbackup.0: $(MANSRC)
! 	/usr/man/manroff $(MANSRC) > $(MAN)
! 
  clean:
! 	rm -f vmsbackup *.o core $(MAN)
! 
  shar:
  	shar -a README vmsbackup.1 Makefile vmsbackup.c match.c \
  	    > vmsbackup.shar