diff options
| -rw-r--r-- | lib/csu/i386/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 108 | ||||
| -rw-r--r-- | usr.bin/doscmd/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/ypserv/Makefile | 4 |
4 files changed, 61 insertions, 61 deletions
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index ab3cd17e0bc0..9cd822c207bc 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.6 (Berkeley) 5/22/91 -# $Id: Makefile,v 1.36 1998/02/11 04:57:10 jdp Exp $ +# $Id: Makefile,v 1.37 1998/05/26 20:12:52 sos Exp $ CFLAGS+= -DLIBC_SCCS -fno-omit-frame-pointer OBJS= crt0.o c++rt0.o gcrt0.o scrt0.o sgcrt0.o @@ -35,7 +35,7 @@ sgcrt0.o: scrt0.o realinstall: ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \ - ${DESTDIR}/${LIBDIR} + ${DESTDIR}${LIBDIR} depend: .depend diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 9218d9f3e800..a8c4e66faa79 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -1,65 +1,65 @@ -# $Id: bsd.libnames.mk,v 1.12 1998/05/15 09:34:48 bde Exp $ +# $Id: bsd.libnames.mk,v 1.13 1998/05/26 20:12:54 sos Exp $ # # The include file <bsd.libnames.mk> define library names. # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this # file where necessary. -LIBCRT0?= ${DESTDIR}/${LIBDIR}/crt0.o -LIBKZHEAD?= ${DESTDIR}/${LIBDIR}/kzhead.o -LIBKZTAIL?= ${DESTDIR}/${LIBDIR}/kztail.o +LIBCRT0?= ${DESTDIR}${LIBDIR}/crt0.o +LIBKZHEAD?= ${DESTDIR}${LIBDIR}/kzhead.o +LIBKZTAIL?= ${DESTDIR}${LIBDIR}/kztail.o -LIBALIAS?= ${DESTDIR}/${LIBDIR}/libalias.a -LIBC?= ${DESTDIR}/${LIBDIR}/libc.a -LIBC_PIC= ${DESTDIR}/${LIBDIR}/libc_pic.a -LIBCALENDAR?= ${DESTDIR}/${LIBDIR}/libcalendar.a -LIBCOM_ERR= ${DESTDIR}/${LIBDIR}/libcom_err.a -LIBCOMPAT?= ${DESTDIR}/${LIBDIR}/libcompat.a -LIBCRYPT?= ${DESTDIR}/${LIBDIR}/libcrypt.a -LIBCURSES?= ${DESTDIR}/${LIBDIR}/libcurses.a -LIBDES?= ${DESTDIR}/${LIBDIR}/libdes.a # XXX doesn't exist -LIBDIALOG?= ${DESTDIR}/${LIBDIR}/libdialog.a -LIBDISK?= ${DESTDIR}/${LIBDIR}/libdisk.a -LIBEDIT?= ${DESTDIR}/${LIBDIR}/libedit.a -LIBF2C?= ${DESTDIR}/${LIBDIR}/libf2c.a +LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a +LIBC?= ${DESTDIR}${LIBDIR}/libc.a +LIBC_PIC= ${DESTDIR}${LIBDIR}/libc_pic.a +LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a +LIBCOM_ERR= ${DESTDIR}${LIBDIR}/libcom_err.a +LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a +LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a +LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a +LIBDES?= ${DESTDIR}${LIBDIR}/libdes.a # XXX doesn't exist +LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a +LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a +LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a +LIBF2C?= ${DESTDIR}${LIBDIR}/libf2c.a LIBFL?= "don't use LIBFL, use LIBL" -LIBFORMS?= ${DESTDIR}/${LIBDIR}/libforms.a -LIBFTPIO?= ${DESTDIR}/${LIBDIR}/libftpio.a -LIBGPLUSPLUS?= ${DESTDIR}/${LIBDIR}/libg++.a -LIBGCC?= ${DESTDIR}/${LIBDIR}/libgcc.a -LIBGCC_PIC?= ${DESTDIR}/${LIBDIR}/libgcc_pic.a -LIBGMP?= ${DESTDIR}/${LIBDIR}/libgmp.a -LIBGNUREGEX?= ${DESTDIR}/${LIBDIR}/libgnuregex.a -LIBIPX?= ${DESTDIR}/${LIBDIR}/libipx.a -LIBKDB?= ${DESTDIR}/${LIBDIR}/libkdb.a # XXX doesn't exist -LIBKRB?= ${DESTDIR}/${LIBDIR}/libkrb.a # XXX doesn't exist -LIBKEYCAP?= ${DESTDIR}/${LIBDIR}/libkeycap.a -LIBKVM?= ${DESTDIR}/${LIBDIR}/libkvm.a -LIBL?= ${DESTDIR}/${LIBDIR}/libl.a +LIBFORMS?= ${DESTDIR}${LIBDIR}/libforms.a +LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a +LIBGPLUSPLUS?= ${DESTDIR}${LIBDIR}/libg++.a +LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a +LIBGCC_PIC?= ${DESTDIR}${LIBDIR}/libgcc_pic.a +LIBGMP?= ${DESTDIR}${LIBDIR}/libgmp.a +LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a +LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a +LIBKDB?= ${DESTDIR}${LIBDIR}/libkdb.a # XXX doesn't exist +LIBKRB?= ${DESTDIR}${LIBDIR}/libkrb.a # XXX doesn't exist +LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a +LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a +LIBL?= ${DESTDIR}${LIBDIR}/libl.a LIBLN?= "don't use, LIBLN, use LIBL" -LIBM?= ${DESTDIR}/${LIBDIR}/libm.a -LIBMD?= ${DESTDIR}/${LIBDIR}/libmd.a -LIBMP?= ${DESTDIR}/${LIBDIR}/libmp.a -LIBMYTINFO?= ${DESTDIR}/${LIBDIR}/libmytinfo.a -LIBNCURSES?= ${DESTDIR}/${LIBDIR}/libncurses.a -LIBOBJC?= ${DESTDIR}/${LIBDIR}/libobjc.a -LIBOPIE?= ${DESTDIR}/${LIBDIR}/libopie.a -LIBPC?= ${DESTDIR}/${LIBDIR}/libpc.a # XXX doesn't exist -LIBPCAP?= ${DESTDIR}/${LIBDIR}/libpcap.a -LIBPLOT?= ${DESTDIR}/${LIBDIR}/libplot.a # XXX doesn't exist -LIBREADLINE?= ${DESTDIR}/${LIBDIR}/libreadline.a -LIBRESOLV?= ${DESTDIR}/${LIBDIR}/libresolv.a # XXX doesn't exist -LIBRPCSVC?= ${DESTDIR}/${LIBDIR}/librpcsvc.a +LIBM?= ${DESTDIR}${LIBDIR}/libm.a +LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a +LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a +LIBMYTINFO?= ${DESTDIR}${LIBDIR}/libmytinfo.a +LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a +LIBOBJC?= ${DESTDIR}${LIBDIR}/libobjc.a +LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a +LIBPC?= ${DESTDIR}${LIBDIR}/libpc.a # XXX doesn't exist +LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a +LIBPLOT?= ${DESTDIR}${LIBDIR}/libplot.a # XXX doesn't exist +LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a +LIBRESOLV?= ${DESTDIR}${LIBDIR}/libresolv.a # XXX doesn't exist +LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a LIBSCRYPT?= "don't use LIBSCRYPT, use LIBCRYPT" -LIBSCSI?= ${DESTDIR}/${LIBDIR}/libscsi.a -LIBSKEY?= ${DESTDIR}/${LIBDIR}/libskey.a -LIBSS?= ${DESTDIR}/${LIBDIR}/libss.a -LIBSTDCPLUSPLUS?= ${DESTDIR}/${LIBDIR}/libstdc++.a -LIBTCL?= ${DESTDIR}/${LIBDIR}/libtcl.a -LIBTELNET?= ${DESTDIR}/${LIBDIR}/libtelnet.a -LIBTERMCAP?= ${DESTDIR}/${LIBDIR}/libtermcap.a +LIBSCSI?= ${DESTDIR}${LIBDIR}/libscsi.a +LIBSKEY?= ${DESTDIR}${LIBDIR}/libskey.a +LIBSS?= ${DESTDIR}${LIBDIR}/libss.a +LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a +LIBTCL?= ${DESTDIR}${LIBDIR}/libtcl.a +LIBTELNET?= ${DESTDIR}${LIBDIR}/libtelnet.a +LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" -LIBUTIL?= ${DESTDIR}/${LIBDIR}/libutil.a -LIBXPG4?= ${DESTDIR}/${LIBDIR}/libxpg4.a -LIBY?= ${DESTDIR}/${LIBDIR}/liby.a -LIBZ?= ${DESTDIR}/${LIBDIR}/libz.a +LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a +LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a +LIBY?= ${DESTDIR}${LIBDIR}/liby.a +LIBZ?= ${DESTDIR}${LIBDIR}/libz.a diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile index 55938ab46e34..953b4028d76c 100644 --- a/usr.bin/doscmd/Makefile +++ b/usr.bin/doscmd/Makefile @@ -1,6 +1,6 @@ # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp # -# $Id: Makefile,v 1.10 1998/03/21 12:51:44 bde Exp $ +# $Id: Makefile,v 1.11 1998/05/26 20:12:55 sos Exp $ PROG= doscmd SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \ @@ -23,7 +23,7 @@ DPADD= ${X11BASE}/lib/libX11.a .else CFLAGS+= -I. -DDISASSEMBLER -DNO_X .endif -LDADD+= -L${DESTDIR}/${LIBDIR} -lgcc -lc +LDADD+= -L${DESTDIR}${LIBDIR} -lgcc -lc DPADD+= ${LIBGCC} ${LIBC} beforeinstall: @@ -34,7 +34,7 @@ beforeinstall: doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC} ld -e start -dc -dp ${LDFLAGS:M-static:S/-static/-Bstatic/} \ - -o doscmd ${LIBCRT0} doscmd_loader.o -L${DESTDIR}/${LIBDIR} -lgcc -lc + -o doscmd ${LIBCRT0} doscmd_loader.o -L${DESTDIR}${LIBDIR} -lgcc -lc # Bogusly generated dependency to get doscmd_loader.c looked at by mkdep. .depend: doscmd_loader.c diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index 274b850f7f16..7157a3ce7bb1 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.14 1998/03/06 14:51:35 bde Exp $ +# $Id: Makefile,v 1.15 1998/05/10 16:03:17 bde Exp $ PROG= ypserv SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ @@ -33,7 +33,7 @@ afterinstall: ${.CURDIR}/Makefile.yp \ ${DESTDIR}/var/yp/Makefile.dist ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ - ${.CURDIR}/ypinit.sh ${DESTDIR}/${BINDIR}/ypinit + ${.CURDIR}/ypinit.sh ${DESTDIR}${BINDIR}/ypinit @if [ ! -f ${DESTDIR}/var/yp/Makefile.dist ]; then \ ln -s ${DESTDIR}/var/yp/Makefile.dist \ ${DESTDIR}/var/yp/Makefile; fi |