Subject: Bunch of fixes
To: netbsd-current-users <current-users@sun-lamp.cs.berkeley.edu>
From: Thomas Eberhardt <thomas@mathematik.uni-Bremen.de>
List: current-users
Date: 11/14/1993 16:15:40
Here is bunch of small fixes that I made while doing a complete rebuild.
1. Some reordering and modifications in the Makefiles for sh, dump,
restore to get dependicies right. The README in /usr/share/mk
states that it's a Bad Thing(tm) to add something after
.include <bsd.prog.mk>, but this seems the only way to get the
dependencies right.
2. Small fix to usr.sbin/sendmail/src/Makefile to use the shared util
library, if available.
3. Typos in share/lkm/Makefile, share/skel/Makefile and
share/man/man4/termios.4
4. Added link.0 to share/man/man5/Makefile
5. Fixed the RCS id in usr.bin/units/units.1
*** ./bin/sh/Makefile- Sun Nov 7 08:18:49 1993
--- ./bin/sh/Makefile Thu Nov 11 01:03:11 1993
***************
*** 23,41 ****
./mkinit '${CC} -c ${CFLAGS} init.c' ${.ALLSRC}
touch ${.TARGET}
- mkinit: ${.CURDIR}/mkinit.c
- ${CC} ${CFLAGS} ${LDFLAGS} ${.CURDIR}/mkinit.c -o $@ ${LDADD}
-
nodes.c nodes.h: mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
./mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
- mknodes: ${.CURDIR}/mknodes.c
- ${CC} ${CFLAGS} ${LDFLAGS} ${.CURDIR}/mknodes.c -o $@ ${LDADD}
-
syntax.c syntax.h: mksyntax
./mksyntax
- mksyntax: ${.CURDIR}/mksyntax.c ${.CURDIR}/parser.h
- ${CC} ${CFLAGS} ${LDFLAGS} ${.CURDIR}/mksyntax.c -o $@ ${LDADD}
-
.include <bsd.prog.mk>
--- 23,41 ----
./mkinit '${CC} -c ${CFLAGS} init.c' ${.ALLSRC}
touch ${.TARGET}
nodes.c nodes.h: mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
./mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat
syntax.c syntax.h: mksyntax
./mksyntax
.include <bsd.prog.mk>
+
+ mkinit: ${LIBCRT0} ${.CURDIR}/mkinit.c ${LIBC} ${DPADD}
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} ${.CURDIR}/mkinit.c -o $@ ${LDADD}
+
+ mknodes: ${LIBCRT0} ${.CURDIR}/mknodes.c ${LIBC} ${DPADD}
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} ${.CURDIR}/mknodes.c -o $@ ${LDADD}
+
+ mksyntax: ${LIBCRT0} ${.CURDIR}/mksyntax.c ${.CURDIR}/parser.h ${LIBC} ${DPADD}
+ ${CC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} ${.CURDIR}/mksyntax.c -o $@ ${LDADD}
*** ./sbin/dump/Makefile- Fri Nov 12 12:17:31 1993
--- ./sbin/dump/Makefile Fri Nov 12 20:51:05 1993
***************
*** 23,31 ****
all: rdump
- rdump: ${LIBCRT0} ${ROBJS} ${LIBC} ${DPADD}
- ${CC} ${LDSTATIC} ${LDFLAGS} -o ${.TARGET} ${ROBJS} ${LDADD}
-
dumprmain.o: dumpmain.o
${CC} -c -DRDUMP ${CFLAGS} ${.CURDIR}/dumpmain.c -o ${.TARGET}
--- 23,28 ----
***************
*** 37,39 ****
--- 34,39 ----
${DESTDIR}${BINDIR}
.include <bsd.prog.mk>
+
+ rdump: ${LIBCRT0} ${ROBJS} ${LIBC} ${DPADD}
+ ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${ROBJS} ${LDADD}
*** ./sbin/restore/Makefile- Fri Nov 12 12:17:57 1993
--- ./sbin/restore/Makefile Fri Nov 12 20:51:34 1993
***************
*** 11,19 ****
all: rrestore
- rrestore: ${LIBCRT0} ${ROBJS} ${LIBC} ${DPADD}
- ${CC} ${LDSTATIC} ${LDFLAGS} -o ${.TARGET} ${ROBJS} ${LDADD}
-
rtape.o: tape.c ${LIBC}
${CC} ${CFLAGS} -c -DRRESTORE ${.CURDIR}/tape.c -o ${.TARGET}
--- 11,16 ----
***************
*** 22,24 ****
--- 19,24 ----
${DESTDIR}${BINDIR}
.include <bsd.prog.mk>
+
+ rrestore: ${LIBCRT0} ${ROBJS} ${LIBC} ${DPADD}
+ ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${ROBJS} ${LDADD}
*** ./share/lkm/Makefile- Sun Nov 7 09:51:41 1993
--- ./share/lkm/Makefile Fri Nov 12 20:59:10 1993
***************
*** 8,14 ****
all clean cleandir depend lint tags:
beforeinstall:
! @install -d root.wheel ${DESTDIR}${BINDIR}/lkm
realinstall:
# XXX:
--- 8,14 ----
all clean cleandir depend lint tags:
beforeinstall:
! @install -d -o root -g wheel -m 755 ${DESTDIR}${BINDIR}/lkm
realinstall:
# XXX:
*** ./share/man/man4/termios.4- Sun Nov 7 09:52:58 1993
--- ./share/man/man4/termios.4 Wed Nov 10 18:59:47 1993
***************
*** 141,147 ****
.Xr fork 2
function call. A process relinquishes its controlling terminal when it
creates a new session with the
! .Xd setsid 2
function; other processes
remaining in the old session that had this terminal as their controlling
terminal continue to have it.
--- 141,147 ----
.Xr fork 2
function call. A process relinquishes its controlling terminal when it
creates a new session with the
! .Xr setsid 2
function; other processes
remaining in the old session that had this terminal as their controlling
terminal continue to have it.
*** ./share/man/man5/Makefile- Sun Nov 7 09:54:23 1993
--- ./share/man/man5/Makefile Thu Nov 11 03:32:00 1993
***************
*** 1,8 ****
# from: @(#)Makefile 5.7.1.1 (Berkeley) 5/7/91
# $Id: Makefile,v 1.6 1993/10/07 07:29:00 cgd Exp $
! MAN5= a.out.0 acct.0 core.0 dir.0 disktab.0 fs.0 fstab.0 \
! group.0 hosts.0 networks.0 passwd.0 pcfs.0 phones.0 printcap.0 \
protocols.0 remote.0 resolver.0 rpc.0 services.0 shells.0 stab.0 \
types.0 utmp.0
MLINKS= dir.5 dirent.5 fs.5 inode.5 utmp.5 wtmp.5 utmp.5 lastlog.5
--- 1,8 ----
# from: @(#)Makefile 5.7.1.1 (Berkeley) 5/7/91
# $Id: Makefile,v 1.6 1993/10/07 07:29:00 cgd Exp $
! MAN5= a.out.0 acct.0 core.0 dir.0 disktab.0 fs.0 fstab.0 group.0 \
! hosts.0 link.0 networks.0 passwd.0 pcfs.0 phones.0 printcap.0 \
protocols.0 remote.0 resolver.0 rpc.0 services.0 shells.0 stab.0 \
types.0 utmp.0
MLINKS= dir.5 dirent.5 fs.5 inode.5 utmp.5 wtmp.5 utmp.5 lastlog.5
*** ./share/skel/Makefile- Sun Nov 7 09:56:21 1993
--- ./share/skel/Makefile Fri Nov 12 20:58:30 1993
***************
*** 7,13 ****
all clean cleandir depend lint tags:
beforeinstall:
! @install -d -o root -g wheel -m 755 ${DESTDIR}{BINDIR}/skel
realinstall:
install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
--- 7,13 ----
all clean cleandir depend lint tags:
beforeinstall:
! @install -d -o root -g wheel -m 755 ${DESTDIR}${BINDIR}/skel
realinstall:
install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
*** ./usr.bin/units/units.1- Sun Nov 7 11:16:58 1993
--- ./usr.bin/units/units.1 Wed Nov 10 19:00:44 1993
***************
*** 1,6 ****
! /*
! * $Id: units.1,v 1.1 1993/10/27 03:31:52 cgd Exp $
! */
.TH UNITS 1 "14 July 1993"
.SH NAME
units - conversion program
--- 1,4 ----
! .\" $Id: units.1,v 1.1 1993/10/27 03:31:52 cgd Exp $
.TH UNITS 1 "14 July 1993"
.SH NAME
units - conversion program
*** ./usr.sbin/sendmail/src/Makefile- Sun Nov 7 11:35:43 1993
--- ./usr.sbin/sendmail/src/Makefile Wed Nov 10 22:19:19 1993
***************
*** 22,28 ****
stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
util.c version.c
DPADD= $(LIBUTIL)
! LDADD= $(LIBUTIL)
MAN1= newaliases.0
MAN5= aliases.0
MAN8= sendmail.0
--- 22,28 ----
stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
util.c version.c
DPADD= $(LIBUTIL)
! LDADD= -lutil
MAN1= newaliases.0
MAN5= aliases.0
MAN8= sendmail.0
--
thomas@mathematik.uni-Bremen.de | Centrum fuer Complexe Systeme & Visualisierung
Thomas Eberhardt | Universitaet Bremen, FB 3, Bibliothekstr. 1
Koelner Str. 4, D-28327 Bremen | D-28359 Bremen, Germany
Home Phone: +49 421 472527 | FAX: +49 421 218-4236, Office: 218-4823
------------------------------------------------------------------------------