Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.prog.mk,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.8 retrieving revision 1.15 diff -u -p -r1.8 -r1.15 --- src/share/mk/bsd.prog.mk 1993/04/08 17:18:46 1.8 +++ src/share/mk/bsd.prog.mk 1993/04/26 13:07:59 1.15 @@ -17,10 +17,12 @@ BINGRP?= bin BINOWN?= bin BINMODE?= 555 - LIBCRT0?= /usr/lib/crt0.o LIBC?= /usr/lib/libc.a LIBCOMPAT?= /usr/lib/libcompat.a +.ifndef EXPORTABLE_SYSTEM +LIBCRYPT?= /usr/lib/libcrypt.a +.endif LIBCURSES?= /usr/lib/libcurses.a LIBDBM?= /usr/lib/libdbm.a LIBDES?= /usr/lib/libdes.a @@ -66,7 +68,7 @@ ${PROG}: ${OBJS} ${LIBC} ${DPADD} SRCS= ${PROG}.c ${PROG}: ${SRCS} ${LIBC} ${DPADD} - ${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD} + ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${SRCS} ${LDADD} MKDEP= -p @@ -74,11 +76,14 @@ MKDEP= -p .if !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ - !defined(MAN7) && !defined(MAN8) && !defined(NOMAN) + !defined(MAN7) && !defined(MAN8) MAN1= ${PROG}.0 .endif .endif + +.if !defined(NOMAN) MANALL= ${MAN1} ${MAN2} ${MAN3} ${MAN4} ${MAN5} ${MAN6} ${MAN7} ${MAN8} +.endif _PROGSUBDIR: .USE .if defined(SUBDIR) && !empty(SUBDIR) @@ -119,6 +124,7 @@ depend: .depend _PROGSUBDIR .if !target(install) .if !target(beforeinstall) beforeinstall: +.if defined(DESTDIR) || defined(BINDIR) @if [ ! -d "${DESTDIR}${BINDIR}" ]; then \ /bin/rm -f ${DESTDIR}${BINDIR} ; \ mkdir -p ${DESTDIR}${BINDIR} ; \ @@ -128,13 +134,15 @@ beforeinstall: true ; \ fi .endif +.endif .if !target(afterinstall) afterinstall: .endif +.if !target(realinstall) realinstall: _PROGSUBDIR .if defined(PROG) - install -c ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${PROG} ${DESTDIR}${BINDIR} .endif .if defined(HIDEGAME) @@ -153,6 +161,7 @@ realinstall: _PROGSUBDIR ln $$l $$t; \ done; true .endif +.endif install: maninstall maninstall: afterinstall