Subject: mount(8) options, !/etc/mtab, libkern.a, MANY others (#298 part 7 of 8) Index: many/many 2.11BSD Description: Mount(8) does not pass options other than 'readonly' thru to the kernel even though the kernel understands many more options than that. /etc/mtab is not needed any longer because applications (mount, umount, others) can obtain the list of mounted filesystems via getmntinfo(3), or getfsstat(2) There are copies of 15 libc routines in the kernel directories. These are invariant but nevertheless are always being recompiled/assembled whenever a kernel is built. Repeat-By: It sounds inadequate, but, "observation". Fix: This is #298 (part 7 of 8). Please refer to part 1 (#292) for detailed instructions and a description of contents. ----------------------------cut here------------------------- *** /usr/src/man/man6/Makefile.old Mon Jan 25 23:04:38 1993 --- /usr/src/man/man6/Makefile Fri Jan 26 00:50:48 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4 (Berkeley) 7/9/88 # MDIR= /usr/man/cat6 SRCS= aardvark.6 adventure.6 arithmetic.6 backgammon.6 banner.6 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/01/26 # MDIR= /usr/man/cat6 SRCS= aardvark.6 adventure.6 arithmetic.6 backgammon.6 banner.6 \ *************** *** 41,47 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/snscore.0 ln ${DESTDIR}${MDIR}/snake.0 ${DESTDIR}${MDIR}/snscore.0 rm -f ${DESTDIR}${MDIR}/cfscores.0 --- 41,47 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/snscore.0 ln ${DESTDIR}${MDIR}/snake.0 ${DESTDIR}${MDIR}/snscore.0 rm -f ${DESTDIR}${MDIR}/cfscores.0 *** /usr/src/man/man7/Makefile.old Mon Jan 18 09:33:58 1993 --- /usr/src/man/man7/Makefile Fri Jan 26 00:49:50 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4 (Berkeley) 7/9/88 # MDIR= /usr/man/cat7 SRCS= ascii.7 environ.7 eqnchar.7 hier.7 hostname.7 intro.7 mailaddr.7 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1996/01/26 # MDIR= /usr/man/cat7 SRCS= ascii.7 environ.7 eqnchar.7 hier.7 hostname.7 intro.7 mailaddr.7 \ *************** *** 35,43 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/miscellaneous.0 ln ${DESTDIR}${MDIR}/intro.0 ${DESTDIR}${MDIR}/miscellaneous.0 FRC: - --- 35,42 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/miscellaneous.0 ln ${DESTDIR}${MDIR}/intro.0 ${DESTDIR}${MDIR}/miscellaneous.0 FRC: *** /usr/src/man/man8/Makefile.old Tue Dec 26 21:17:31 1995 --- /usr/src/man/man8/Makefile Thu Jan 25 23:42:06 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.1 (2.11BSD) 1995/12/26 # MDIR= /usr/man/cat8 SRCS= XNSrouted.8 ac.8 adduser.8 arff.8 arp.8 autoconfig.8 bad144.8 \ --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.4.3 (2.11BSD) 1996/1/23 # MDIR= /usr/man/cat8 SRCS= XNSrouted.8 ac.8 adduser.8 arff.8 arp.8 autoconfig.8 bad144.8 \ *************** *** 24,31 **** gettable.8 getty.8 htable.8 icheck.8 ifconfig.8 implog.8 \ implogd.8 inetd.8 init.8 intro.8 kgmon.8 lpc.8 lpd.8 makedev.8 \ makekey.8 mkfs.8 mkhosts.8 mklost+found.8 mknod.8 mkproto.8 \ ! mount.8 named.8 ncheck.8 newfs.8 pac.8 pstat.8 quot.8 \ ! quotacheck.8 quotaon.8 rc.8 rdump.8 reboot.8 renice.8 repquota.8 \ restor.8 rexecd.8 rmt.8 route.8 routed.8 rrestore.8 \ rwhod.8 rxformat.8 sa.8 savecore.8 sendmail.8 shutdown.8 \ slattach.8 sticky.8 swapon.8 sync.8 syslogd.8 talkd.8 telnetd.8 \ --- 24,31 ---- gettable.8 getty.8 htable.8 icheck.8 ifconfig.8 implog.8 \ implogd.8 inetd.8 init.8 intro.8 kgmon.8 lpc.8 lpd.8 makedev.8 \ makekey.8 mkfs.8 mkhosts.8 mklost+found.8 mknod.8 mkproto.8 \ ! named.8 ncheck.8 newfs.8 pac.8 pstat.8 quot.8 \ ! quotaon.8 rc.8 rdump.8 reboot.8 renice.8 repquota.8 \ restor.8 rexecd.8 rmt.8 route.8 routed.8 rrestore.8 \ rwhod.8 rxformat.8 sa.8 savecore.8 sendmail.8 shutdown.8 \ slattach.8 sticky.8 swapon.8 sync.8 syslogd.8 talkd.8 telnetd.8 \ *************** *** 38,45 **** gettable.0 getty.0 htable.0 icheck.0 ifconfig.0 implog.0 \ implogd.0 inetd.0 init.0 intro.0 kgmon.0 lpc.0 lpd.0 makedev.0 \ makekey.0 mkfs.0 mkhosts.0 mklost+found.0 mknod.0 mkproto.0 \ ! mount.0 named.0 ncheck.0 newfs.0 pac.0 pstat.0 quot.0 \ ! quotacheck.0 quotaon.0 rc.0 rdump.0 reboot.0 renice.0 repquota.0 \ restor.0 rexecd.0 rmt.0 route.0 routed.0 rrestore.0 \ rwhod.0 rxformat.0 sa.0 savecore.0 sendmail.0 shutdown.0 \ slattach.0 sticky.0 swapon.0 sync.0 syslogd.0 talkd.0 telnetd.0 \ --- 38,45 ---- gettable.0 getty.0 htable.0 icheck.0 ifconfig.0 implog.0 \ implogd.0 inetd.0 init.0 intro.0 kgmon.0 lpc.0 lpd.0 makedev.0 \ makekey.0 mkfs.0 mkhosts.0 mklost+found.0 mknod.0 mkproto.0 \ ! named.0 ncheck.0 newfs.0 pac.0 pstat.0 quot.0 \ ! quotaon.0 rc.0 rdump.0 reboot.0 renice.0 repquota.0 \ restor.0 rexecd.0 rmt.0 route.0 routed.0 rrestore.0 \ rwhod.0 rxformat.0 sa.0 savecore.0 sendmail.0 shutdown.0 \ slattach.0 sticky.0 swapon.0 sync.0 syslogd.0 talkd.0 telnetd.0 \ *************** *** 59,71 **** rm -f ${OBJS} install: _make_01 ! install -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/accton.0 ln ${DESTDIR}${MDIR}/sa.0 ${DESTDIR}${MDIR}/accton.0 rm -f ${DESTDIR}${MDIR}/flcopy.0 ln ${DESTDIR}${MDIR}/arff.0 ${DESTDIR}${MDIR}/flcopy.0 - rm -f ${DESTDIR}${MDIR}/umount.0 - ln ${DESTDIR}${MDIR}/mount.0 ${DESTDIR}${MDIR}/umount.0 rm -f ${DESTDIR}${MDIR}/fastboot.0 ln ${DESTDIR}${MDIR}/reboot.0 ${DESTDIR}${MDIR}/fastboot.0 rm -f ${DESTDIR}${MDIR}/halt.0 --- 59,69 ---- rm -f ${OBJS} install: _make_01 ! install -c -o bin -g bin -m 444 ${OBJS} ${DESTDIR}${MDIR} rm -f ${DESTDIR}${MDIR}/accton.0 ln ${DESTDIR}${MDIR}/sa.0 ${DESTDIR}${MDIR}/accton.0 rm -f ${DESTDIR}${MDIR}/flcopy.0 ln ${DESTDIR}${MDIR}/arff.0 ${DESTDIR}${MDIR}/flcopy.0 rm -f ${DESTDIR}${MDIR}/fastboot.0 ln ${DESTDIR}${MDIR}/reboot.0 ${DESTDIR}${MDIR}/fastboot.0 rm -f ${DESTDIR}${MDIR}/halt.0 *************** *** 76,79 **** ln ${DESTDIR}${MDIR}/uucico.0 ${DESTDIR}${MDIR}/uucpd.0 FRC: - --- 74,76 ---- *** /usr/src/new/ansi/Makefile.old Fri Jan 22 21:53:17 1993 --- /usr/src/new/ansi/Makefile Sun Jan 28 17:37:36 1996 *************** *** 1,13 **** ! # @(#)Makefile 5.3 (Berkeley) 86/05/15 # DESTDIR= CFLAGS= -O SEPFLAG=-i - INCPATH= - LFLAGS= - LIBS= - SRCS= ansitape.c vmsprep.c MSRC= ansitape.1 vmsprep.1 MOBJ= ansitape.0 vmsprep.0 --- 1,9 ---- ! # @(#)Makefile 5.3.1 (2.11BSD) 1996/1/28 # DESTDIR= CFLAGS= -O SEPFLAG=-i SRCS= ansitape.c vmsprep.c MSRC= ansitape.1 vmsprep.1 MOBJ= ansitape.0 vmsprep.0 *************** *** 17,65 **** .1.0: /usr/man/manroff $*.1 > $*.0 ! all: ansitape vmsprep ! ansitape: ansitape.c ! cc ${CFLAGS} ${SEPFLAG} -o ansitape ansitape.c ! vmsprep: vmsprep.c ! cc ${CFLAGS} ${SEPFLAG} -o vmsprep vmsprep.c 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 depend: ! cc -M ${INCPATH} vmsprep.c ansitape.c | sed 's/\.o//' | \ ! awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \ ! else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \ ! else rec = rec " " $$2 } } \ ! END { print rec } ' > makedep ! echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep ! echo '$$r makedep' >>eddep ! echo 'w' >>eddep ! cp Makefile Makefile.bak ! ed - Makefile < eddep ! rm eddep makedep ! echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile ! echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile ! echo '# see make depend above' >> Makefile ! ! # DO NOT DELETE THIS LINE -- make depend uses it ! ! ! vmsprep: vmsprep.c /usr/include/stdio.h /usr/include/ctype.h ! vmsprep: /usr/include/strings.h ! ansitape: ansitape.c /usr/include/sys/types.h /usr/include/sys/time.h ! ansitape: /usr/include/time.h /usr/include/sys/mtio.h /usr/include/sys/ioctl.h ! ansitape: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h ! ansitape: /usr/include/sys/file.h /usr/include/sys/stat.h /usr/include/a.out.h ! ansitape: /usr/include/sys/exec.h /usr/include/stdio.h /usr/include/ctype.h ! # DEPENDENCIES MUST END AT END OF FILE ! # IF YOU PUT STUFF HERE IT WILL GO AWAY ! # see make depend above --- 13,34 ---- .1.0: /usr/man/manroff $*.1 > $*.0 ! all: ansitape vmsprep ${MOBJ} ! ansitape: ansitape.o ! cc ${SEPFLAG} -o ansitape ansitape.o ! vmsprep: vmsprep.o ! cc ${SEPFLAG} -o vmsprep vmsprep.o install: vmsprep ansitape ${MOBJ} install -s ansitape ${DESTDIR}/usr/new/ansitape install -s vmsprep ${DESTDIR}/usr/new/vmsprep ! install -c -m 444 -o bin -g bin ansitape.0 ${DESTDIR}/usr/new/man/cat1 ! install -c -m 444 -o bin -g bin vmsprep.0 ${DESTDIR}/usr/new/man/cat1 clean: ! rm -f *.o a.out core errs makefile.bak Makefile.bak ansitape vmsprep *.0 depend: ! mkdep ${CFLAGS} ${SRCS} *** /usr/src/new/bm/Makefile.old Fri Jan 22 21:55:06 1993 --- /usr/src/new/bm/Makefile Sun Jan 28 17:39:26 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # bm Makefile - revised 1996/1/28 + # DESTDIR= CFLAGS = -O *************** *** 14,25 **** .1.0: /usr/man/manroff $*.1 > $*.0 ! bm: ${OBJS} cc -o $@ ${SEPFLAG} ${OBJS} 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 $< --- 17,28 ---- .1.0: /usr/man/manroff $*.1 > $*.0 ! bm: ${OBJS} bm.0 cc -o $@ ${SEPFLAG} ${OBJS} install: bm bm.0 install -s bm ${DESTDIR}/usr/new/bm ! install -c -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 Fri Jan 22 21:56:11 1993 --- /usr/src/new/checkobj/Makefile Sun Jan 28 17:42:24 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # checkobj Makefile. Revised 1996/.1/28 + # DESTDIR= DEFS= *************** *** 4,13 **** 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 --- 7,16 ---- CFLAGS= -O ${DEFS} SEPFLAG=-i ! all: checkobj checkobj.0 ! checkobj: checkobj.o ! cc ${CFLAGS} ${SEPFLAG} checkobj.o -o checkobj install: checkobj checkobj.0 install -s checkobj ${DESTDIR}/usr/new/checkobj *** /usr/src/new/la/Makefile.old Fri Jan 22 21:58:53 1993 --- /usr/src/new/la/Makefile Sun Jan 28 17:44:45 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # la Makefile. Revised 1996/1/28 + # DESTDIR= DEFS= *************** *** 4,13 **** 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 --- 7,16 ---- CFLAGS= -O ${DEFS} SEPFLAG=-i ! all: la la.0 ! la: la.o ! cc ${CFLAGS} ${SEPFLAG} la.o -o la install: la la.0 install -s la ${DESTDIR}/usr/new/la *** /usr/src/new/m11/Makefile.old Fri Jan 22 21:59:26 1993 --- /usr/src/new/m11/Makefile Sun Jan 28 17:47:01 1996 *************** *** 1,3 **** --- 1,5 ---- + # m11 Makefile. Revised 1996/1/28 + # # Note that the pathname for macxrf is wired into exec.m11 ... DESTDIR= *************** *** 25,31 **** lout.obj mac.obj srch.obj xlat.obj misc.obj pst.obj \ errs.obj debug.obj often.obj xpcor.obj syscalls.obj ! all: m11 macxrf m11: ${OBJS} ${L11} -ls ${SEPFLAG} ${OBJS} --- 27,33 ---- lout.obj mac.obj srch.obj xlat.obj misc.obj pst.obj \ errs.obj debug.obj often.obj xpcor.obj syscalls.obj ! all: m11 macxrf m11.0 m11: ${OBJS} ${L11} -ls ${SEPFLAG} ${OBJS} *** /usr/src/new/oldassn/Makefile.old Fri Jan 22 22:02:10 1993 --- /usr/src/new/oldassn/Makefile Sun Jan 28 17:54:58 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # oldassn Makefile. Revised 1996/1/28 + # DESTDIR= DEFS= *************** *** 4,10 **** CFLAGS= -O ${DEFS} SEPFLAG=-i ! all: oldassn oldassn: oldassn.l lex oldassn.l --- 7,13 ---- CFLAGS= -O ${DEFS} SEPFLAG=-i ! all: oldassn oldassn.0 oldassn: oldassn.l lex oldassn.l *** /usr/src/new/patch/Makefile.old Fri Jan 22 22:02:26 1993 --- /usr/src/new/patch/Makefile Sun Jan 28 17:58:55 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # patch Makefile. Revised 1996/1/28 + # DESTDIR= DEFS= *************** *** 14,20 **** .man.0: /usr/man/manroff $*.man > $*.0 ! patch: ${OBJS} cc ${SEPFLAG} ${OBJS} -o patch install: patch patch.0 --- 17,23 ---- .man.0: /usr/man/manroff $*.man > $*.0 ! patch: ${OBJS} patch.0 cc ${SEPFLAG} ${OBJS} -o patch install: patch patch.0 *** /usr/src/new/shar/Makefile.old Fri Jan 22 22:07:52 1993 --- /usr/src/new/shar/Makefile Sun Jan 28 18:13:29 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # shar Makefile. Revised 1996/1/28 + # DESTDIR= CFLAGS= -O *************** *** 11,20 **** .1.0: /usr/man/manroff $*.1 > $*.0 shar: ${OBJS} Makefile cc ${CFLAGS} ${SEPFLAG} -o shar ${OBJS} ! traverse: cc -o traverse -DSTANDALONE traverse.c lint: --- 14,25 ---- .1.0: /usr/man/manroff $*.1 > $*.0 + all: shar traverse shar.0 + shar: ${OBJS} Makefile cc ${CFLAGS} ${SEPFLAG} -o shar ${OBJS} ! traverse: traverse.c cc -o traverse -DSTANDALONE traverse.c lint: *************** *** 22,27 **** --- 27,33 ---- install: shar shar.0 install -s shar ${DESTDIR}/usr/new/shar + install -s traverse ${DESTDIR}/usr/new/traverse install -c -m 444 -o bin -g bin shar.0 ${DESTDIR}/usr/new/man/cat1 tags: ${SRCS} *** /usr/src/new/shortc/Makefile.old Fri Jan 22 22:13:59 1993 --- /usr/src/new/shortc/Makefile Sun Jan 28 18:17:12 1996 *************** *** 1,3 **** --- 1,6 ---- + # + # shortc Makefile. Revised 1996/1/28 + # DESTDIR= DEFS= *************** *** 4,17 **** 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 --- 7,20 ---- CFLAGS= -O ${DEFS} SEPFLAG=-i ! all: shortc shortc.0 ! shortc: shortc.o ! cc ${CFLAGS} ${SEPFLAG} shortc.o -o shortc install: shortc shortc.0 install -s shortc ${DESTDIR}/usr/new/shortc ! install -c -m 444 -o bin -g bin shortc.0 ${DESTDIR}/usr/new/man/cat1 shortc.0: shortc.1 /usr/man/manroff shortc.1 > shortc.0 *** /usr/src/new/tcsh/Makefile.old Tue Jan 19 20:37:17 1993 --- /usr/src/new/tcsh/Makefile Sun Jan 28 18:22:22 1996 *************** *** 1,5 **** ! # $Id: Makefile,v 1.6 90/12/12 08:23:27 christos Exp $ ! # Makefile 4.3 6/11/83 # # C Shell with process control; VM/UNIX VAX Makefile # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria --- 1,4 ---- ! # Makefile 4.3.1 1996/1/28 # # C Shell with process control; VM/UNIX VAX Makefile # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria *************** *** 176,182 **** #ALLOC=tc.alloc.o ALLOC=tc.alloc.o alloc11.o ! all: mkprstr tcsh mkprstr: mkprstr.c ${CC} -O -o mkprstr mkprstr.c --- 175,181 ---- #ALLOC=tc.alloc.o ALLOC=tc.alloc.o alloc11.o ! all: mkprstr tcsh tcsh.${CATSECT} mkprstr: mkprstr.c ${CC} -O -o mkprstr mkprstr.c *************** *** 357,375 **** -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} - chmod 444 ${DESTMAN}/tcsh.${MANSECT} - clean: ${RM} -f a.out strings x.c xs.c tcsh _MAKE_LOG core ./mkprstr ${RM} -f *.${SUF} sh.prof.c ed.defns.h tc.const.h sh.err.h ! ${RM} -f ${STRINGFILE} veryclean: clean ${RM} -f *~ #* --- 356,370 ---- -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 -c -m 444 -o bin -g bin tcsh.${CATSECT} ${DESTDIR}${DESTCAT} tcsh.${CATSECT}: tcsh.man /usr/man/manroff tcsh.man > tcsh.${CATSECT} clean: ${RM} -f a.out strings x.c xs.c tcsh _MAKE_LOG core ./mkprstr ${RM} -f *.${SUF} sh.prof.c ed.defns.h tc.const.h sh.err.h ! ${RM} -f ${STRINGFILE} tcsh.${CATSECT} veryclean: clean ${RM} -f *~ #* *** /usr/src/new/traceroute/Makefile.old Fri Jan 22 22:15:38 1993 --- /usr/src/new/traceroute/Makefile Sun Jan 28 18:35:07 1996 *************** *** 1,13 **** INCL = CFLAGS = -O -i LIBS = ! 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 --- 1,18 ---- + # + # traceroute Makefile. Revised 1996/1/28 + # INCL = CFLAGS = -O -i LIBS = ! all: traceroute traceroute.0 + traceroute: traceroute.o + cc $(CFLAGS) $(INCL) -o traceroute traceroute.o $(LIBS) + install: traceroute traceroute.0 install -s -o root -g bin -m 4551 traceroute ${DESTDIR}/etc/traceroute ! install -c -m 444 -o bin -g bin traceroute.0 ${DESTDIR}/usr/new/man/cat8 traceroute.0: traceroute.8 /usr/man/manroff traceroute.8 > traceroute.0 *** /usr/src/ucb/Mail/def.h.old Thu Oct 22 13:33:45 1992 --- /usr/src/ucb/Mail/def.h Sat Jan 27 00:56:28 1996 *************** *** 30,36 **** * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ! * @(#)def.h 5.22 (Berkeley) 6/25/90 */ #include /* includes */ --- 30,36 ---- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ! * @(#)def.h 5.22.1 (2.11BSD) 1996/1/27 */ #include /* includes */ *************** *** 89,95 **** * Given a file address, determine the block number it represents. */ #define blockof(off) ((int) ((off) / 4096)) ! #define offsetof(off) ((int) ((off) % 4096)) #define positionof(block, offset) ((off_t)(block) * 4096 + (offset)) /* --- 89,95 ---- * Given a file address, determine the block number it represents. */ #define blockof(off) ((int) ((off) / 4096)) ! #define offstof(off) ((int) ((off) % 4096)) #define positionof(block, offset) ((off_t)(block) * 4096 + (offset)) /* *** /usr/src/ucb/Mail/edit.c.old Sun Feb 14 10:47:20 1993 --- /usr/src/ucb/Mail/edit.c Sat Jan 27 00:57:10 1996 *************** *** 32,38 **** */ #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)edit.c 5.15 (Berkeley) 6/25/90"; #endif #include "rcv.h" --- 32,38 ---- */ #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)edit.c 5.15.1 (2.11BSD) 1996/1/27"; #endif #include "rcv.h" *************** *** 109,115 **** (void) fseek(otf, (long) 0, 2); size = ftell(otf); mp->m_block = blockof(size); ! mp->m_offset = offsetof(size); mp->m_size = fsize(fp); mp->m_lines = 0; mp->m_flag |= MODIFY; --- 109,115 ---- (void) fseek(otf, (long) 0, 2); size = ftell(otf); mp->m_block = blockof(size); ! mp->m_offset = offstof(size); mp->m_size = fsize(fp); mp->m_lines = 0; mp->m_flag |= MODIFY; *** /usr/src/ucb/Mail/fio.c.old Sun Feb 14 11:24:19 1993 --- /usr/src/ucb/Mail/fio.c Sat Jan 27 00:57:55 1996 *************** *** 32,38 **** */ #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)fio.c 5.24 (Berkeley) 2/3/91"; #endif #include "rcv.h" --- 32,38 ---- */ #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)fio.c 5.24.1 (2.11BSD) 1996/1/27"; #endif #include "rcv.h" *************** *** 109,115 **** this.m_size = 0; this.m_lines = 0; this.m_block = blockof(offset); ! this.m_offset = offsetof(offset); inhead = 1; } else if (linebuf[0] == 0) { inhead = 0; --- 109,115 ---- this.m_size = 0; this.m_lines = 0; this.m_block = blockof(offset); ! this.m_offset = offstof(offset); inhead = 1; } else if (linebuf[0] == 0) { inhead = 0; *** /usr/src/ucb/finger/Makefile.old Thu Jan 21 09:23:19 1993 --- /usr/src/ucb/finger/Makefile Sun Jan 28 19:54:22 1996 *************** *** 14,20 **** # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2 (Berkeley) 5/10/89 # SEPFLAG= -i --- 14,20 ---- # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/1/28 # SEPFLAG= -i *************** *** 24,30 **** OBJS= finger.o lprint.o net.o sprint.o util.o MAN= finger.0 ! all: finger finger: ${LIBC} ${OBJS} ${CC} -o $@ ${CFLAGS} ${OBJS} --- 24,30 ---- OBJS= finger.o lprint.o net.o sprint.o util.o MAN= finger.0 ! all: finger ${MAN} finger: ${LIBC} ${OBJS} ${CC} -o $@ ${CFLAGS} ${OBJS} *************** *** 36,42 **** rm -f ${MAN} tags .depend depend: ${SRCS} ! mkdep -p ${CFLAGS} ${SRCS} # install: ${MAN} install: finger ${MAN} --- 36,42 ---- rm -f ${MAN} tags .depend depend: ${SRCS} ! mkdep ${CFLAGS} ${SRCS} # install: ${MAN} install: finger ${MAN} *** /usr/src/ucb/finger/util.c.old Sun Mar 18 07:17:41 1990 --- /usr/src/ucb/finger/util.c Fri Jan 12 19:44:30 1996 *************** *** 18,25 **** * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ ! #ifndef lint ! static char sccsid[] = "@(#)util.c 5.8 (Berkeley) 2/7/90"; #endif /* not lint */ #include --- 18,25 ---- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ ! #if !defined(lint) && defined(DOSCCS) ! static char sccsid[] = "@(#)util.c 5.8.1 (2.11BSD) 1996/1/12"; #endif /* not lint */ #include *************** *** 38,44 **** extern time_t now; extern int errno; struct stat sb; - char *strerror(); (void)sprintf(tbuf, "%s/%s", _PATH_DEV, w->tty); if (stat(tbuf, &sb) < 0) { --- 38,43 ---- *************** *** 57,62 **** --- 56,62 ---- register struct passwd *pw; { register char *p, *t; + char *bp; char name[256]; pn->realname = pn->office = pn->officephone = pn->homephone = NULL; *************** *** 67,78 **** pn->shell = strdup(pw->pw_shell); /* why do we skip asterisks!?!? */ ! (void)strcpy(p = tbuf, pw->pw_gecos); ! if (*p == '*') ! ++p; /* ampersands get replaced by the login name */ ! if (!(p = strsep(p, ","))) return; for (t = name; *t = *p; ++p) if (*t == '&') { --- 67,78 ---- pn->shell = strdup(pw->pw_shell); /* why do we skip asterisks!?!? */ ! (void)strcpy(bp = tbuf, pw->pw_gecos); ! if (*bp == '*') ! ++bp; /* ampersands get replaced by the login name */ ! if (!(p = strsep(&bp, ","))) return; for (t = name; *t = *p; ++p) if (*t == '&') { *************** *** 84,94 **** else ++t; pn->realname = strdup(name); ! pn->office = ((p = strsep((char *)NULL, ",")) && *p) ? strdup(p) : NULL; ! pn->officephone = ((p = strsep((char *)NULL, ",")) && *p) ? strdup(p) : NULL; ! pn->homephone = ((p = strsep((char *)NULL, ",")) && *p) ? strdup(p) : NULL; } --- 84,94 ---- else ++t; pn->realname = strdup(name); ! pn->office = ((p = strsep(&bp, ",")) && *p) ? strdup(p) : NULL; ! pn->officephone = ((p = strsep(&bp, ",")) && *p) ? strdup(p) : NULL; ! pn->homephone = ((p = strsep(&bp, ",")) && *p) ? strdup(p) : NULL; } *** /usr/src/ucb/ftp/Makefile.old Mon Jan 18 09:35:53 1993 --- /usr/src/ucb/ftp/Makefile Sun Jan 28 18:46:08 1996 *************** *** 14,20 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile based on 5.9 (Berkeley) 4/20/89 # CFLAGS= -O -I. LIBC= /lib/libc.a --- 14,20 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.9.1 (2.11BSD) 1996/1/28 # CFLAGS= -O -I. LIBC= /lib/libc.a *************** *** 24,30 **** MAN= ftp.0 MANSRC= ftp.1 ! all: ftp ftp: ${OBJS} ${LIBC} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} --- 24,30 ---- MAN= ftp.0 MANSRC= ftp.1 ! all: ftp ${MAN} ftp: ${OBJS} ${LIBC} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} *** /usr/src/ucb/lock/Makefile.old Mon Jan 18 09:35:55 1993 --- /usr/src/ucb/lock/Makefile Sun Jan 28 19:54:35 1996 *************** *** 14,20 **** # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2 (Berkeley) 2/22/89 # CFLAGS= -O --- 14,20 ---- # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND # FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.2.1 (2.11BSD) 1996/1/28 # CFLAGS= -O *************** *** 21,34 **** SEPFLAG= -i LIBC= /lib/libc.a SRCS= lock.c ! OBJS= MAN= lock.0 MANSRC= lock.1 ! all: lock ! lock: ${LIBC} ! ${CC} ${SEPFLAG} -o $@ ${CFLAGS} $@.c lock.0: ${MANSRC} /usr/man/manroff ${MANSRC} > ${MAN} --- 21,34 ---- SEPFLAG= -i LIBC= /lib/libc.a SRCS= lock.c ! OBJS= lock.o MAN= lock.0 MANSRC= lock.1 ! all: lock ${MAN} ! lock: ${LIBC} ${OBJS} ! ${CC} ${SEPFLAG} -o $@ ${OBJS} lock.0: ${MANSRC} /usr/man/manroff ${MANSRC} > ${MAN} *************** *** 40,46 **** rm -f tags .depend depend: ${SRCS} ! mkdep -p ${CFLAGS} ${SRCS} install: lock ${MAN} install -s -o root -g bin -m 4755 lock ${DESTDIR}/usr/ucb --- 40,46 ---- rm -f tags .depend depend: ${SRCS} ! mkdep ${CFLAGS} ${SRCS} install: lock ${MAN} install -s -o root -g bin -m 4755 lock ${DESTDIR}/usr/ucb *** /usr/src/ucb/man/Makefile.old Tue Jan 26 08:48:52 1993 --- /usr/src/ucb/man/Makefile Sun Jan 28 19:44:46 1996 *************** *** 14,40 **** # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.5 (Berkeley) 6/29/88 # CFLAGS= -O SEPFLAG= -i LIBC= /lib/libc.a ASRCS= apropos.c MSRCS= man.c all: man apropos ! apropos: ${LIBC} ! ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${ASRCS} ! man: ${LIBC} ! ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${MSRCS} clean: FRC ! rm -f core apropos man depend: FRC ! mkdep -p ${CFLAGS} ${ASRCS} ${MSRCS} install: man apropos rm -f ${DESTDIR}/usr/ucb/whatis ${DESTDIR}/usr/ucb/apropos --- 14,42 ---- # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # ! # @(#)Makefile 5.5.1 (2.11BSD) 1996/1/28 # CFLAGS= -O SEPFLAG= -i LIBC= /lib/libc.a ASRCS= apropos.c + AOBJS= apropos.o MSRCS= man.c + MOBJS= man.o all: man apropos ! apropos: ${LIBC} ${AOBJS} ! ${CC} ${SEPFLAG} -o $@ ${AOBJS} ! man: ${LIBC} ${MOBJS} ! ${CC} ${SEPFLAG} -o $@ ${MOBJS} clean: FRC ! rm -f core apropos man *.o depend: FRC ! mkdep ${CFLAGS} ${ASRCS} ${MSRCS} install: man apropos rm -f ${DESTDIR}/usr/ucb/whatis ${DESTDIR}/usr/ucb/apropos *************** *** 52,68 **** sort -o tags tags FRC: - # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. ! apropos: apropos.c /usr/include/sys/param.h /usr/include/sys/localopts.h ! apropos: /usr/include/machine/machparam.h /usr/include/signal.h ! apropos: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/ctype.h ! apropos: /usr/include/strings.h ! man: man.c /usr/include/sys/param.h /usr/include/sys/localopts.h ! man: /usr/include/machine/machparam.h /usr/include/signal.h ! man: /usr/include/sys/types.h /usr/include/sys/file.h /usr/include/sys/dir.h ! man: /usr/include/stdio.h /usr/include/ctype.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY --- 54,72 ---- sort -o tags tags FRC: # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. ! apropos.o: apropos.c /usr/include/sys/param.h /usr/include/sys/localopts.h ! apropos.o: /usr/include/sys/stddef.h /usr/include/machine/machparam.h ! apropos.o: /usr/include/sys/types.h /usr/include/signal.h ! apropos.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/ctype.h ! apropos.o: /usr/include/strings.h /usr/include/string.h ! apropos.o: /usr/include/sys/types.h ! man.o: man.c /usr/include/sys/param.h /usr/include/sys/localopts.h ! man.o: /usr/include/sys/stddef.h /usr/include/machine/machparam.h ! man.o: /usr/include/sys/types.h /usr/include/signal.h /usr/include/sys/types.h ! man.o: /usr/include/sys/file.h /usr/include/fcntl.h /usr/include/sys/types.h ! man.o: /usr/include/sys/dir.h /usr/include/stdio.h /usr/include/ctype.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY *** /usr/src/ucb/pascal/pi/Makefile.old Mon Jan 18 09:35:59 1993 --- /usr/src/ucb/pascal/pi/Makefile Sat Jan 27 18:40:27 1996 *************** *** 1,5 **** # ! # pi Makefile # DESTDIR= --- 1,5 ---- # ! # pi Makefile - 1.1 1996/1/27 # DESTDIR= *************** *** 64,71 **** ${CC} ${CFLAGS} ${DEFS} -o px_header.out px_header.c pi: ${OBJS} version - ./version > Version.c - ${CC} -c Version.c -if [ X${SEPFLAG} = X-i ]; then \ ${CC} ${SEPFLAG} ${CFLAGS} -o pi ${OBJS} Version.c; \ else \ --- 64,69 ---- *************** *** 82,87 **** --- 80,88 ---- version: version.c ${CC} -o version version.c + Version.c: version + ./version > Version.c + install: ${ALL} install -c ${ERRORSTRINGS} ${DESTDIR}/usr/lib install -c how_pi ${DESTDIR}/usr/lib *************** *** 98,104 **** clean: rm -f *.o ${TEMPDIR}/* y.tab.c y.tab.h \ ! ${ALL} core *.list tags print : @ls -ls | pr --- 99,106 ---- clean: rm -f *.o ${TEMPDIR}/* y.tab.c y.tab.h \ ! ${ALL} core *.list tags Version.c ! rm -fr tmp print : @ls -ls | pr *************** *** 109,114 **** --- 111,117 ---- yy.h: y.tab.h Version.o: Version.c + cc -c Version.c TRdata.o: whoami 0.h ato.o: 0.h whoami ato.c call.o: whoami 0.h tree.h opcode.h call.c *** /usr/src/ucb/quota.c.old Mon Jan 10 22:38:58 1994 --- /usr/src/ucb/quota.c Sun Jan 21 17:40:15 1996 *************** *** 9,15 **** "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)quota.c 5.4.1 (2.11BSD GTE) 1/1/94"; #endif /* --- 9,15 ---- "@(#) Copyright (c) 1980 Regents of the University of California.\n\ All rights reserved.\n"; ! static char sccsid[] = "@(#)quota.c 5.4.2 (2.11BSD GTE) 1996/1/21"; #endif /* *************** *** 20,25 **** --- 20,26 ---- #include #include #include + #include #include #include *************** *** 107,114 **** register struct fstab *fs; register char *msgi, *msgb; register enab = 1; ! dev_t fsdev; struct stat statb; struct dqblk dqblk; int myuid, fd; char qfilename[MAXPATHLEN + 1], iwarn[8], dwarn[8]; --- 108,116 ---- register struct fstab *fs; register char *msgi, *msgb; register enab = 1; ! dev_t fsdev; struct stat statb; + char *qfpathname; struct dqblk dqblk; int myuid, fd; char qfilename[MAXPATHLEN + 1], iwarn[8], dwarn[8]; *************** *** 121,134 **** done = 0; (void) setfsent(); while (fs = getfsent()) { if (stat(fs->fs_spec, &statb) < 0) continue; msgi = msgb = (char *) 0; fsdev = statb.st_rdev; - (void) sprintf(qfilename, "%s/%s", fs->fs_file, qfname); if (stat(qfilename, &statb) < 0 || statb.st_dev != fsdev) continue; ! if (quota(Q_GETDLIM, uid, fsdev, (caddr_t)&dqblk) != 0) { fd = open(qfilename, O_RDONLY); if (fd < 0) continue; --- 123,145 ---- done = 0; (void) setfsent(); while (fs = getfsent()) { + if (strcmp(fs->fs_vfstype, "ufs")) + continue; + if (!hasquota(fs, &qfpathname)) + continue; if (stat(fs->fs_spec, &statb) < 0) continue; msgi = msgb = (char *) 0; + (void) sprintf(qfilename, "%s/%s", fs->fs_file, qfpathname); + /* + * This check for the quota file being in the filesystem to which the quotas + * belong is silly but the kernel enforces it. When the kernel is fixed the + * check can be removed. + */ fsdev = statb.st_rdev; if (stat(qfilename, &statb) < 0 || statb.st_dev != fsdev) continue; ! if (quota(Q_GETDLIM, uid, fsdev, (caddr_t)&dqblk)) { fd = open(qfilename, O_RDONLY); if (fd < 0) continue; *************** *** 285,290 **** --- 296,337 ---- } printf("%s", buf); column += strlen(buf); + } + + /* + * Check to see if a particular quota is to be enabled. + */ + hasquota(fs, qfnamep) + register struct fstab *fs; + char **qfnamep; + { + register char *opt; + char *cp; + static char initname, usrname[100]; + static char buf[BUFSIZ]; + + if (!initname) { + strcpy(usrname, qfname); + initname = 1; + } + strcpy(buf, fs->fs_mntops); + for (opt = strtok(buf, ","); opt; opt = strtok(NULL, ",")) { + if (cp = index(opt, '=')) + *cp++ = '\0'; + if (strcmp(opt, usrname) == 0) + break; + if (strcmp(opt, FSTAB_RQ) == 0) /* XXX compatibility */ + break; + } + if (!opt) + return (0); + if (cp) { + *qfnamep = cp; + return (1); + } + (void) sprintf(buf, "%s/%s", fs->fs_file, qfname); + *qfnamep = buf; + return (1); } alldigits(s) *** /usr/src/usr.bin/f77/Makefile.old Fri Jun 9 21:33:01 1995 --- /usr/src/usr.bin/f77/Makefile Sun Jan 28 16:26:41 1996 *************** *** 2,8 **** # generating code for the PDP11, # using the Ritchie pass 2 # ! # 1995/06/09 - 2.11BSD # AS= as -V --- 2,8 ---- # generating code for the PDP11, # using the Ritchie pass 2 # ! # 1996/1/28 - 2.11BSD # AS= as -V *************** *** 57,63 **** ${CC} -S ${CFLAGS} xxgram.c mv xxgram.s gram.s # Eliminate yacc data structures ! -if [ X${SEPFLAG} = X-n ]; then ed - gram.s < :gram.fix; fi rm xxgram.c ${AS} -u -o gram.o gram.s rm gram.s --- 57,64 ---- ${CC} -S ${CFLAGS} xxgram.c mv xxgram.s gram.s # Eliminate yacc data structures ! -if [ X${SEPFLAG} = X-n ]; then ed - gram.s < :gram.fix; \ ! else :; fi rm xxgram.c ${AS} -u -o gram.o gram.s rm gram.s *************** *** 74,80 **** mkstr - f77_strings xx $*.c ${CC} -S ${CFLAGS} xx$*.c # Move switch code to text space ! -if [ X${SEPFLAG} = X-n ]; then ed - xx$*.s < :rofix; fi ${C2} xx$*.s | ${AS} -u -o $*.o rm xx$*.c xx$*.s --- 75,82 ---- mkstr - f77_strings xx $*.c ${CC} -S ${CFLAGS} xx$*.c # Move switch code to text space ! -if [ X${SEPFLAG} = X-n ]; \ ! then ed - xx$*.s < :rofix; else :; fi ${C2} xx$*.s | ${AS} -u -o $*.o rm xx$*.c xx$*.s *** /usr/src/usr.bin/learn/Makefile.old Mon Jan 18 09:36:48 1993 --- /usr/src/usr.bin/learn/Makefile Sun Jan 28 20:04:38 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.6 (Berkeley) 6/18/87 # # Flag BSD4_2 means 4.2 or later. CFLAGS= -O -DBSD4_2 --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 4.6.1 (2.11BSD) 1996/1/28 # # Flag BSD4_2 means 4.2 or later. CFLAGS= -O -DBSD4_2 *************** *** 20,33 **** learn: ${OBJS} ${LIBC} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} ! lcount: lcount.c ${LIBC} ! ${CC} ${CFLAGS} ${SEPFLAG} -o $@ lcount.c ! lrntee: lrntee.c ${LIBC} ! ${CC} ${CFLAGS} ${SEPFLAG} -o $@ lrntee.c clean: FRC ! rm -f ${OBJS} core learn lrntee lcount depend: FRC mkdep ${CFLAGS} ${SRCS} lcount.c lrntee.c --- 20,33 ---- learn: ${OBJS} ${LIBC} ${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS} ! lcount: lcount.o ${LIBC} ! ${CC} ${CFLAGS} ${SEPFLAG} -o $@ lcount.o ! lrntee: lrntee.o ${LIBC} ! ${CC} ${CFLAGS} ${SEPFLAG} -o $@ lrntee.o clean: FRC ! rm -f *.o core learn lrntee lcount depend: FRC mkdep ${CFLAGS} ${SRCS} lcount.c lrntee.c *** /usr/src/usr.lib/lib2648/Makefile.old Sat Feb 21 18:27:24 1987 --- /usr/src/usr.lib/lib2648/Makefile Sun Jan 28 00:52:30 1996 *************** *** 3,9 **** # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1 (Berkeley) 4/26/85 # LIBDIR= /usr/lib DESTDIR= --- 3,9 ---- # All rights reserved. The Berkeley software License Agreement # specifies the terms and conditions for redistribution. # ! # @(#)Makefile 5.1.1 (2.11BSD) 1996/1/27 # LIBDIR= /usr/lib DESTDIR= *************** *** 29,35 **** ar cr lib2648.a `lorder ${OBJS} | tsort` install: lib2648.a ! install lib2648.a ${DESTDIR}${LIBDIR}/lib2648.a ranlib ${DESTDIR}${LIBDIR}/lib2648.a tags: /tmp --- 29,35 ---- ar cr lib2648.a `lorder ${OBJS} | tsort` install: lib2648.a ! install -m 644 lib2648.a ${DESTDIR}${LIBDIR}/lib2648.a ranlib ${DESTDIR}${LIBDIR}/lib2648.a tags: /tmp