Date: Sun, 7 Jul 2002 10:01:40 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13869 for review Message-ID: <200207071701.g67H1eIu075955@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13869 Change 13869 by rwatson@rwatson_paprika on 2002/07/07 10:00:59 Integ recent changes to system makefiles to fix builds for things like gnome and other recent ports changes. Affected files ... .. //depot/projects/trustedbsd/base/share/mk/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#2 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#2 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.links.mk#1 branch .. //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#10 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/share/mk/Makefile#7 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/share/mk/Makefile,v 1.39 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/Makefile,v 1.40 2002/07/02 12:16:54 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk FILES+= bsd.info.mk bsd.incs.mk bsd.init.mk FILES+= bsd.kern.mk bsd.kmod.mk -FILES+= bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk +FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk +FILES+= bsd.obj.mk bsd.own.mk FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk FILES+= bsd.prog.mk bsd.subdir.mk bsd.sys.mk FILES+= sys.mk ==== //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.35 2002/05/07 00:15:53 bde Exp $ +# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.36 2002/07/03 12:44:06 ru Exp $ # # The include file <bsd.dep.mk> handles Makefile dependencies. # @@ -150,3 +150,25 @@ .endif .endif .endif + +.if !target(checkdpadd) && (defined(DPADD) || defined(LDADD)) +checkdpadd: +.if ${OBJFORMAT} != aout + @ldadd=`echo \`for lib in ${DPADD} ; do \ + echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ + done \`` ; \ + ldadd1=`echo ${LDADD}` ; \ + if [ "$$ldadd" != "$$ldadd1" ] ; then \ + echo ${.CURDIR} ; \ + echo "DPADD -> $$ldadd" ; \ + echo "LDADD -> $$ldadd1" ; \ + fi +.else + @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ + if [ "$$dpadd" != "${DPADD}" ] ; then \ + echo ${.CURDIR} ; \ + echo "LDADD -> $$dpadd" ; \ + echo "DPADD = ${DPADD}" ; \ + fi +.endif +.endif ==== //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91 -# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.52 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.53 2002/07/01 14:51:42 ru Exp $ # # The include file <bsd.doc.mk> handles installing BSD troff documents. # @@ -110,17 +110,6 @@ ${DFILE} ${DESTDIR}${BINDIR}/${VOLUME} .endif -install: beforeinstall realinstall afterinstall - -.if !target(beforeinstall) -beforeinstall: - -.endif -.if !target(afterinstall) -afterinstall: - -.endif - spell: ${SRCS} (cd ${.CURDIR}; spell ${SRCS} ) | sort | \ comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell ==== //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.files.mk,v 1.1 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.files.mk,v 1.2 2002/07/03 12:28:03 ru Exp $ .if !target(__<bsd.init.mk>__) .error bsd.files.mk cannot be included directly. @@ -66,3 +66,4 @@ .endif !target(installfiles) realinstall: installfiles +.ORDER: beforeinstall installfiles ==== //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.2 2002/05/15 16:19:54 ru Exp $ +# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.3 2002/07/03 12:28:03 ru Exp $ .if !target(__<bsd.init.mk>__) .error bsd.incs.mk cannot be included directly. @@ -77,3 +77,4 @@ .endif !target(installincludes) realinstall: installincludes +.ORDER: beforeinstall installincludes ==== //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.info.mk,v 1.64 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.info.mk,v 1.65 2002/07/06 14:58:20 ru Exp $ # # The include file <bsd.info.mk> handles installing GNU (tech)info files. # Texinfo is a documentation system that uses a single source @@ -144,7 +144,7 @@ .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} -${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE} +${x:S/$/-install/}: ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ ==== //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.129 2002/06/26 08:41:00 jmallett Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.132 2002/07/03 16:22:43 ru Exp $ # .include <bsd.init.mk> @@ -13,7 +13,7 @@ .undef INSTALL_PIC_ARCHIVE .else .if ${OBJFORMAT} == elf -.if !defined(SHLIB_NAME) && defined(SHLIB_MAJOR) +.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} SHLIB_LINK?= lib${LIB}.so .endif @@ -154,19 +154,23 @@ all: objwarn +.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) +OBJS+= ${SRCS:N*.h:R:S/$/.o/} +.endif + .if defined(LIB) && !empty(LIB) _LIBS= lib${LIB}.a -OBJS+= ${SRCS:N*.h:R:S/$/.o/} lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} ${RANLIB} ${.TARGET} +.endif .if !defined(INTERNALLIB) -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_p.a POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} @@ -177,7 +181,10 @@ ${RANLIB} ${.TARGET} .endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) SOBJS+= ${OBJS:.o=.So} +.endif .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} @@ -199,7 +206,7 @@ .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_pic.a lib${LIB}_pic.a: ${SOBJS} @@ -209,7 +216,7 @@ ${RANLIB} ${.TARGET} .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) LINTLIB= llib-l${LIB}.ln _LIBS+= ${LINTLIB} LINTOBJS+= ${SRCS:M*.c:.c=.ln} @@ -224,8 +231,6 @@ all: ${_LIBS} -.endif defined(LIB) && !empty(LIB) - .if !defined(NOMAN) all: _manpages .endif @@ -237,20 +242,30 @@ .endif .if defined(LIB) && !empty(LIB) rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS} +.endif .if !defined(INTERNALLIB) -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) rm -f ${POBJS} ${POBJS:S/$/.tmp/} .endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} +.endif .if defined(SHLIB_NAME) - rm -f ${SHLIB_LINK} lib${LIB}.so.* lib${LIB}.so +.if defined(SHLIB_LINK) + rm -f ${SHLIB_LINK} +.endif +.if defined(LIB) && !empty(LIB) + rm -f lib${LIB}.so.* lib${LIB}.so +.endif .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) rm -f ${LINTOBJS} .endif .endif !defined(INTERNALLIB) +.if defined(_LIBS) && !empty(_LIBS) rm -f ${_LIBS} -.endif defined(LIB) && !empty(LIB) +.endif .if defined(CLEANDIRS) && !empty(CLEANDIRS) rm -rf ${CLEANDIRS} .endif @@ -288,14 +303,15 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} .endfor -.if defined(LIB) && !empty(LIB) && !defined(INTERNALLIB) +.if !defined(INTERNALLIB) realinstall: _libinstall +.ORDER: beforeinstall _libinstall _libinstall: -.if !defined(NOINSTALLLIB) +.if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif @@ -307,45 +323,23 @@ ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif -.endif defined(LIB) && !empty(LIB) && !defined(INTERNALLIB) +.endif !defined(INTERNALLIB) -realinstall: -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ - done; true -.endif - .include <bsd.files.mk> .include <bsd.incs.mk> +.include <bsd.links.mk> .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif @@ -361,9 +355,13 @@ .include <bsd.dep.mk> +.if !exists(${.OBJDIR}/${DEPENDFILE}) .if defined(LIB) && !empty(LIB) -.if !exists(${.OBJDIR}/${DEPENDFILE}) -${OBJS} ${STATICOBJS} ${POBJS} ${SOBJS}: ${SRCS:M*.h} +${OBJS} ${STATICOBJS} ${POBJS}: ${SRCS:M*.h} +.endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) +${SOBJS}: ${SRCS:M*.h} .endif .endif ==== //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#5 (text+ko) ==== @@ -1,5 +1,4 @@ -# Based on $NetBSD: bsd.nls.mk,v 1.35 2001/11/28 20:19:08 tv Exp $ -# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.9 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.10 2002/07/02 12:37:07 ru Exp $ # # This include file <bsd.nls.mk> handles building and installing Native # Language Support (NLS) catalogs @@ -21,108 +20,57 @@ # NLSOWN National Language Support files owner. [${SHAREOWN}] # # NO_NLS Do not make or install NLS files. [not set] -# -# +++ targets +++ -# -# install: -# Install compiled NLS files -# -# bsd.obj.mk: cleandir and obj -.include <bsd.init.mk> +.if !target(__<bsd.init.mk>__) +.error bsd.nls.mk cannot be included directly. +.endif GENCAT?= gencat -new -NLSDIR?= ${SHAREDIR}/nls -NLSGRP?= ${SHAREGRP} -NLSMODE?= ${NOBINMODE} -NLSOWN?= ${SHAREOWN} - -NLS?= -NLSLINKS= - .SUFFIXES: .cat .msg .msg.cat: ${GENCAT} ${.TARGET} ${.IMPSRC} +.if defined(NLS) && !empty(NLS) && !defined(NO_NLS) + # # .msg file pre-build rules # +NLSSRCDIR?= ${.CURDIR} .for file in ${NLS} -.if !defined(NLSSRCDIR_${file}) && defined(NLSSRCDIR) -NLSSRCDIR_${file}=${NLSSRCDIR} +.if defined(NLSSRCFILES) +NLSSRCFILES_${file}?= ${NLSSRCFILES} .endif -.if !defined(NLSSRCFILES_${file}) && defined(NLSSRCFILES) -NLSSRCFILES_${file}=${NLSSRCFILES} -.endif - .if defined(NLSSRCFILES_${file}) -${file}: +NLSSRCDIR_${file}?= ${NLSSRCDIR} +${file}.msg: ${NLSSRCFILES_${file}:S/^/${NLSSRCDIR_${file}}\//} @rm -f ${.TARGET} - cat ${NLSSRCDIR_${file}}/${NLSSRCFILES_${file}} > ${.TARGET} -CLEANFILES+= ${file} + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= ${file}.msg .endif - -.if defined(NLSLINKS_${file:C/.msg//g}) && !empty(NLSLINKS_${file:C/.msg//g}) -NLSLINKS+= ${file:C/.msg//g} -.endif .endfor # # .cat file build rules # -NLSALL= ${NLS:.msg=.cat} -CLEANFILES+= ${NLSALL} +NLS:= ${NLS:=.cat} +CLEANFILES+= ${NLS} +FILESGROUPS?= FILES +FILESGROUPS+= NLS +NLSDIR?= ${SHAREDIR}/nls # # installation rules # -__nlsinstall: .USE - ${INSTALL} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} \ - ${.ALLSRC} ${.TARGET} - -.for F in ${NLSALL} -_F:= ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat - -${_F}: ${F} __nlsinstall # install rule -nlsinstall:: ${_F} -.PRECIOUS: ${_F} # keep if install fails +.for file in ${NLS} +NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat +.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) +NLSLINKS+= ${file:R} +.endif +.for dst in ${NLSLINKS_${file:R}} +SYMLINKS+= ../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat .endfor - -links-nls: -.if defined(NLSLINKS) && !empty(NLSLINKS) -.for src in ${NLSLINKS} -.for dst in ${NLSLINKS_${src}} - ln -fs ../${src}/${NLSNAME}.cat \ - ${DESTDIR}${NLSDIR}/${dst}/${NLSNAME}.cat .endfor -.endfor -.endif -# - -.if !defined(NO_NLS) && !empty(NLS) -all-nls: ${NLSALL} -.else -all-nls: -.endif - -.if !defined(NO_NLS) && !empty(NLS) -realinstall: beforeinstall nlsinstall links-nls -.else -realinstall: beforeinstall -.endif - -all: all-nls -install: realinstall afterinstall - -.if !target(beforeinstall) -beforeinstall: -.endif - -.if !target(afterinstall) -afterinstall: -.endif - -.include <bsd.obj.mk> +.endif defined(NLS) && !empty(NLS) && !defined(NO_NLS) ==== //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.44 2002/06/21 07:30:51 ru Exp $ +# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.46 2002/07/03 12:44:06 ru Exp $ # # The include file <bsd.obj.mk> handles creating the 'obj' directory # and cleaning up object files, etc. @@ -10,15 +10,15 @@ # CLEANFILES Additional files to remove for the clean target. # # MAKEOBJDIR A pathname for the directory where the targets -# are built. Note: MAKEOBJDIR is an *enviroment* variable -# and works properly only if set as an enviroment variable, +# are built. Note: MAKEOBJDIR is an *environment* variable +# and works properly only if set as an environment variable, # not as a global or command line variable! # # E.g. use `env MAKEOBJDIR=temp-obj make' # # MAKEOBJDIRPREFIX Specifies somewhere other than /usr/obj to root the object -# tree. Note: MAKEOBJDIRPREFIX is an *enviroment* variable -# and works properly only if set as an enviroment variable, +# tree. Note: MAKEOBJDIRPREFIX is an *environment* variable +# and works properly only if set as an environment variable, # not as a global or command line variable! # # E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make' @@ -126,31 +126,6 @@ .endif .endif -.if !target(checkdpadd) -checkdpadd: -.if (defined(DPADD) || defined(LDADD)) -checkdpadd: -.if ${OBJFORMAT} != aout - @ldadd=`echo \`for lib in ${DPADD} ; do \ - echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ - done \`` ; \ - ldadd1=`echo ${LDADD}` ; \ - if [ "$$ldadd" != "$$ldadd1" ] ; then \ - echo ${.CURDIR} ; \ - echo "DPADD -> $$ldadd" ; \ - echo "LDADD -> $$ldadd1" ; \ - fi -.else - @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ - if [ "$$dpadd" != "${DPADD}" ] ; then \ - echo ${.CURDIR} ; \ - echo "LDADD -> $$dpadd" ; \ - echo "DPADD = ${DPADD}" ; \ - fi -.endif -.endif -.endif - cleandir: cleanobj DISTRIBUTION?= base ==== //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.122 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.125 2002/07/03 12:28:03 ru Exp $ .include <bsd.init.mk> @@ -102,6 +102,7 @@ .if !target(realinstall) realinstall: _proginstall +.ORDER: beforeinstall _proginstall _proginstall: .if defined(PROG) .if defined(PROGNAME) @@ -116,34 +117,11 @@ (cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \ chown -h ${BINOWN}:${ORIGBINGRP} ${PROG}) .endif - -realinstall: -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ - done; true -.endif .endif !target(realinstall) .if defined(SCRIPTS) && !empty(SCRIPTS) realinstall: _scriptsinstall +.ORDER: beforeinstall _scriptsinstall SCRIPTSDIR?= ${BINDIR} SCRIPTSOWN?= ${BINOWN} @@ -169,11 +147,16 @@ .endfor .endif +NLSNAME?= ${PROG} +.include <bsd.nls.mk> + .include <bsd.files.mk> .include <bsd.incs.mk> +.include <bsd.links.mk> .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif ==== //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.42 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.43 2002/07/01 14:49:16 ru Exp $ # # The include file <bsd.subdir.mk> contains the default targets # for building subdirectories. @@ -81,7 +81,6 @@ .if !target(afterinstall) afterinstall: .endif -install: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +install: beforeinstall realinstall afterinstall +.ORDER: beforeinstall realinstall afterinstall .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207071701.g67H1eIu075955>