[Midnightbsd-cvs] src: share/mk: Sync relevant changes with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Oct 14 17:13:55 EDT 2008
Log Message:
-----------
Sync relevant changes with freebsd
Modified Files:
--------------
src/share/mk:
Makefile (r1.3 -> r1.4)
bsd.README (r1.2 -> r1.3)
bsd.compat.mk (r1.2 -> r1.3)
bsd.incs.mk (r1.2 -> r1.3)
bsd.info.mk (r1.3 -> r1.4)
bsd.lib.mk (r1.2 -> r1.3)
bsd.libnames.mk (r1.4 -> r1.5)
bsd.man.mk (r1.2 -> r1.3)
bsd.nls.mk (r1.2 -> r1.3)
bsd.port.mk (r1.6 -> r1.7)
bsd.prog.mk (r1.3 -> r1.4)
bsd.sys.mk (r1.4 -> r1.5)
-------------- next part --------------
Index: bsd.nls.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.nls.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L share/mk/bsd.nls.mk -L share/mk/bsd.nls.mk -u -r1.2 -r1.3
--- share/mk/bsd.nls.mk
+++ share/mk/bsd.nls.mk
@@ -19,8 +19,6 @@
# NLSMODE National Language Support files mode. [${NOBINMODE}]
#
# NLSOWN National Language Support files owner. [${SHAREOWN}]
-#
-# NO_NLS Do not make or install NLS files. [not set]
.if !target(__<bsd.init.mk>__)
.error bsd.nls.mk cannot be included directly.
@@ -33,7 +31,7 @@
.msg.cat:
${GENCAT} ${.TARGET} ${.IMPSRC}
-.if defined(NLS) && !empty(NLS) && !defined(NO_NLS)
+.if defined(NLS) && !empty(NLS) && ${MK_NLS} != "no"
#
# .msg file pre-build rules
@@ -74,4 +72,4 @@
.endfor
.endfor
-.endif # defined(NLS) && !empty(NLS) && !defined(NO_NLS)
+.endif # defined(NLS) && !empty(NLS) && ${MK_NLS} != "no"
Index: bsd.libnames.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.libnames.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/mk/bsd.libnames.mk -L share/mk/bsd.libnames.mk -u -r1.4 -r1.5
--- share/mk/bsd.libnames.mk
+++ share/mk/bsd.libnames.mk
@@ -150,3 +150,5 @@
LIBY?= ${DESTDIR}${LIBDIR}/liby.a
LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a
LIBZ?= ${DESTDIR}${LIBDIR}/libz.a
+LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a
+LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a
Index: bsd.compat.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.compat.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L share/mk/bsd.compat.mk -L share/mk/bsd.compat.mk -u -r1.2 -r1.3
--- share/mk/bsd.compat.mk
+++ share/mk/bsd.compat.mk
@@ -16,7 +16,6 @@
NOINFO:NO_INFO \
NOINFOCOMPRESS:NO_INFOCOMPRESS \
NOINSTALLLIB:NO_INSTALLLIB \
- NOLIBC_R:NO_LIBC_R \
NOLIBPTHREAD:NO_LIBPTHREAD \
NOLIBTHR:NO_LIBTHR \
NOLINT:NO_LINT \
@@ -34,7 +33,7 @@
.for old in ${oldnew:C/:.*//}
.for new in ${oldnew:C/.*://}
.if defined(${old}) && !defined(${new})
-.warning ${old} is deprecated in favor of ${new}
+.warning ${old} is deprecated in favour of ${new}
${new}= ${${old}}
.endif
.endfor
Index: bsd.README
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.README,v
retrieving revision 1.2
retrieving revision 1.3
diff -L share/mk/bsd.README -L share/mk/bsd.README -u -r1.2 -r1.3
--- share/mk/bsd.README
+++ share/mk/bsd.README
@@ -37,6 +37,7 @@
bsd.port.pre.mk - building ports
bsd.port.subdir.mk - targets for building subdirectories for ports
bsd.prog.mk - building programs from source files
+bsd.snmpmod.mk - building modules for the SNMP daemon bsnmpd
bsd.subdir.mk - targets for building subdirectories
bsd.sys.mk - common settings used for building MidnightBSD sources
sys.mk - default rules for all makes
@@ -187,8 +188,7 @@
all:
build the program and its manual page
clean:
- remove the program, any object files and the files a.out,
- Errs, errs, mklog, and ${PROG}.core.
+ remove the program and any object files.
cleandir:
remove all of the files removed by the target clean, as
well as .depend, tags, and any manual pages.
@@ -305,11 +305,11 @@
To build foo from foo.c with a manual page foo.2, add the line:
- MAN2= foo.2
+ MAN= foo.2
If foo does not have a manual page at all, add the line:
- NO_MAN= noman
+ NO_MAN=
If foo has multiple source files, add the line:
Index: bsd.sys.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.sys.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/mk/bsd.sys.mk -L share/mk/bsd.sys.mk -u -r1.4 -r1.5
--- share/mk/bsd.sys.mk
+++ share/mk/bsd.sys.mk
@@ -9,21 +9,24 @@
# for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143
+# Universally disable -Werror until src/ is in better shape for GCC 4.2
+NO_WERROR=
+
.if !defined(NO_WARNS) && ${CC} != "icc"
-.if defined(CSTD)
+. if defined(CSTD)
. if ${CSTD} == "k&r"
-CFLAGS += -traditional
+CFLAGS += -traditional
. elif ${CSTD} == "c89" || ${CSTD} == "c90"
-CFLAGS += -std=iso9899:1990
+CFLAGS += -std=iso9899:1990
. elif ${CSTD} == "c94" || ${CSTD} == "c95"
-CFLAGS += -std=iso9899:199409
+CFLAGS += -std=iso9899:199409
. elif ${CSTD} == "c99"
-CFLAGS += -std=iso9899:1999
+CFLAGS += -std=iso9899:1999
. else
-CFLAGS += -std=${CSTD}
+CFLAGS += -std=${CSTD}
. endif
# -pedantic is problematic because it also imposes namespace restrictions
-#CFLAGS += -pedantic
+#CFLAGS += -pedantic
. endif
. if defined(WARNS)
. if ${WARNS} >= 1
@@ -52,6 +55,9 @@
# XXX always get it right.
CWARNFLAGS += -Wno-uninitialized
. endif
+. if !defined(WITH_GCC3)
+CWARNFLAGS += -Wno-pointer-sign
+. endif
. endif
. if defined(FORMAT_AUDIT)
@@ -69,7 +75,7 @@
.endif
.if defined(IGNORE_PRAGMA)
-CWARNFLAGS += -Wno-unknown-pragmas
+CWARNFLAGS += -Wno-unknown-pragmas
.endif
# Allow user-specified additional warning flags
Index: bsd.incs.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.incs.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L share/mk/bsd.incs.mk -L share/mk/bsd.incs.mk -u -r1.2 -r1.3
--- share/mk/bsd.incs.mk
+++ share/mk/bsd.incs.mk
@@ -5,6 +5,8 @@
.error bsd.incs.mk cannot be included directly.
.endif
+.if !defined(NO_INCS) && ${MK_TOOLCHAIN} != "no"
+
INCSGROUPS?= INCS
.if !target(buildincludes)
@@ -79,3 +81,5 @@
realinstall: installincludes
.ORDER: beforeinstall installincludes
+
+.endif # !defined(NO_INCS) && ${MK_TOOLCHAIN} != "no"
Index: bsd.prog.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.prog.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -L share/mk/bsd.prog.mk -L share/mk/bsd.prog.mk -u -r1.3 -r1.4
--- share/mk/bsd.prog.mk
+++ share/mk/bsd.prog.mk
@@ -16,6 +16,11 @@
CFLAGS+=${COPTS}
.endif
+.if ${MK_ASSERT_DEBUG} == "no"
+CFLAGS+= -DNDEBUG
+NO_WERROR=
+.endif
+
.if defined(DEBUG_FLAGS)
CFLAGS+=${DEBUG_FLAGS}
.endif
@@ -41,8 +46,12 @@
# If there are Objective C sources, link with Objective C libraries.
.if !empty(SRCS:M*.m)
-OBJCLIBS?= -lobjc -lpthread
+.if defined(OBJCLIBS)
LDADD+= ${OBJCLIBS}
+.else
+DPADD+= ${LIBOBJC} ${LIBPTHREAD}
+LDADD+= -lobjc -lpthread
+.endif
.endif
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
@@ -80,7 +89,7 @@
.endif
-.if !defined(NO_MAN) && !defined(MAN) && \
+.if ${MK_MAN} != "no" && !defined(MAN) && \
!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
!defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
@@ -91,7 +100,7 @@
.endif
all: objwarn ${PROG} ${SCRIPTS}
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
all: _manpages
.endif
@@ -180,12 +189,10 @@
.include <bsd.nls.mk>
.include <bsd.files.mk>
-.if !defined(NO_INCS)
.include <bsd.incs.mk>
-.endif
.include <bsd.links.mk>
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
realinstall: _maninstall
.ORDER: beforeinstall _maninstall
.endif
@@ -199,7 +206,7 @@
.endif
.endif
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
.include <bsd.man.mk>
.endif
Index: bsd.port.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -L share/mk/bsd.port.mk -L share/mk/bsd.port.mk -u -r1.6 -r1.7
--- share/mk/bsd.port.mk
+++ share/mk/bsd.port.mk
@@ -4,5 +4,9 @@
PORTSDIR?= /usr/mports
BSDPORTMK?= ${PORTSDIR}/Mk/bsd.mport.mk
+# Needed to keep bsd.own.mk from reading in /etc/src.conf
+# and setting MK_* variables when building ports.
+_WITHOUT_SRCCONF=
+
.include <bsd.own.mk>
.include "${BSDPORTMK}"
Index: bsd.lib.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.lib.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L share/mk/bsd.lib.mk -L share/mk/bsd.lib.mk -u -r1.2 -r1.3
--- share/mk/bsd.lib.mk
+++ share/mk/bsd.lib.mk
@@ -28,6 +28,11 @@
CFLAGS+= ${CRUNCH_CFLAGS}
.endif
+.if ${MK_ASSERT_DEBUG} == "no"
+CFLAGS+= -DNDEBUG
+NO_WERROR=
+.endif
+
.if defined(DEBUG_FLAGS)
CFLAGS+= ${DEBUG_FLAGS}
.endif
@@ -99,6 +104,15 @@
all: objwarn
+.include <bsd.symver.mk>
+
+# Allow librararies to specify their own version map or have it
+# automatically generated (see bsd.symver.mk above).
+.if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP)
+${SHLIB_NAME}: ${VERSION_MAP}
+LDFLAGS+= -Wl,--version-script=${VERSION_MAP}
+.endif
+
.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME)
OBJS+= ${SRCS:N*.h:R:S/$/.o/}
.endif
@@ -109,20 +123,28 @@
lib${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
+.if !defined(NM)
@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+.else
+ @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+.endif
${RANLIB} ${.TARGET}
.endif
.if !defined(INTERNALLIB)
-.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
+.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
_LIBS+= lib${LIB}_p.a
POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po}
lib${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
+.if !defined(NM)
@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+.else
+ @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+.endif
${RANLIB} ${.TARGET}
.endif
@@ -140,12 +162,18 @@
.if defined(SHLIB_LINK)
@ln -fs ${.TARGET} ${SHLIB_LINK}
.endif
+.if !defined(NM)
@${CC} ${LDFLAGS} -shared -Wl,-x \
-o ${.TARGET} -Wl,-soname,${SONAME} \
`lorder ${SOBJS} | tsort -q` ${LDADD}
+.else
+ @${CC} ${LDFLAGS} -shared -Wl,-x \
+ -o ${.TARGET} -Wl,-soname,${SONAME} \
+ `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+.endif
.endif
-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
_LIBS+= lib${LIB}_pic.a
lib${LIB}_pic.a: ${SOBJS}
@@ -170,7 +198,7 @@
all: ${_LIBS}
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
all: _manpages
.endif
@@ -207,11 +235,11 @@
realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
-.if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
+.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
.endif
-.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
+.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
.endif
@@ -232,7 +260,7 @@
.endif
.endif
.endif
-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
.endif
@@ -244,12 +272,10 @@
.include <bsd.nls.mk>
.include <bsd.files.mk>
-.if !defined(NO_INCS)
.include <bsd.incs.mk>
-.endif
.include <bsd.links.mk>
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
realinstall: _maninstall
.ORDER: beforeinstall _maninstall
.endif
@@ -261,7 +287,7 @@
${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
.endif
-.if !defined(NO_MAN)
+.if ${MK_MAN} != "no"
.include <bsd.man.mk>
.endif
@@ -292,7 +318,7 @@
rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS}
.endif
.if !defined(INTERNALLIB)
-.if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
+.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
rm -f ${POBJS} ${POBJS:S/$/.tmp/}
.endif
.if defined(SHLIB_NAME) || \
@@ -317,6 +343,9 @@
.if defined(CLEANDIRS) && !empty(CLEANDIRS)
rm -rf ${CLEANDIRS}
.endif
+.if !empty(VERSION_DEF) && !empty(SYMBOL_MAPS)
+ rm -f ${VERSION_MAP}
+.endif
.endif
.include <bsd.obj.mk>
Index: bsd.man.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.man.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -L share/mk/bsd.man.mk -L share/mk/bsd.man.mk -u -r1.2 -r1.3
--- share/mk/bsd.man.mk
+++ share/mk/bsd.man.mk
@@ -68,9 +68,9 @@
# Backwards compatibility.
.if !defined(MAN)
-.for sect in ${SECTIONS}
-.if defined(MAN${sect}) && !empty(MAN${sect})
-MAN+= ${MAN${sect}}
+.for __sect in ${SECTIONS}
+.if defined(MAN${__sect}) && !empty(MAN${__sect})
+MAN+= ${MAN${__sect}}
.endif
.endfor
.endif
@@ -94,16 +94,16 @@
.if defined(MAN) && !empty(MAN)
CLEANFILES+= ${MAN:T:S/$/${FILTEXTENSION}/g}
CLEANFILES+= ${MAN:T:S/$/${CATEXT}${FILTEXTENSION}/g}
-.for page in ${MAN}
-.for target in ${page:T:S/$/${FILTEXTENSION}/g}
-_manpages: ${target}
-${target}: ${page}
+.for __page in ${MAN}
+.for __target in ${__page:T:S/$/${FILTEXTENSION}/g}
+_manpages: ${__target}
+${__target}: ${__page}
${MANFILTER} < ${.ALLSRC} > ${.TARGET}
.endfor
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-.for target in ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g}
-_manpages: ${target}
-${target}: ${page}
+.for __target in ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g}
+_manpages: ${__target}
+${__target}: ${__page}
${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} > ${.TARGET}
.endfor
.endif
@@ -113,10 +113,10 @@
.if defined(MAN) && !empty(MAN)
CLEANFILES+= ${MAN:T:S/$/${CATEXT}/g}
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-.for page in ${MAN}
-.for target in ${page:T:S/$/${CATEXT}/g}
-_manpages: ${target}
-${target}: ${page}
+.for __page in ${MAN}
+.for __target in ${__page:T:S/$/${CATEXT}/g}
+_manpages: ${__target}
+${__target}: ${__page}
${MROFF_CMD} ${.ALLSRC} > ${.TARGET}
.endfor
.endfor
@@ -133,10 +133,10 @@
.if defined(MAN) && !empty(MAN)
CLEANFILES+= ${MAN:T:S/$/${MCOMPRESS_EXT}/g}
CLEANFILES+= ${MAN:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g}
-.for page in ${MAN}
-.for target in ${page:T:S/$/${MCOMPRESS_EXT}/}
-_manpages: ${target}
-${target}: ${page}
+.for __page in ${MAN}
+.for __target in ${__page:T:S/$/${MCOMPRESS_EXT}/}
+_manpages: ${__target}
+${__target}: ${__page}
.if defined(MANFILTER)
${MANFILTER} < ${.ALLSRC} | ${MCOMPRESS_CMD} > ${.TARGET}
.else
@@ -144,9 +144,9 @@
.endif
.endfor
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-.for target in ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/}
-_manpages: ${target}
-${target}: ${page}
+.for __target in ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/}
+_manpages: ${__target}
+${__target}: ${__page}
.if defined(MANFILTER)
${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} | ${MCOMPRESS_CMD} > ${.TARGET}
.else
@@ -165,12 +165,12 @@
_maninstall: ${MAN}
.if defined(NO_MANCOMPRESS)
.if defined(MANFILTER)
-.for page in ${MAN}
- ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
- ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
+.for __page in ${MAN}
+ ${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
.endif
.endfor
.else
@@ -186,19 +186,19 @@
${MINSTALL} $${page} $${d}; \
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-.for page in ${MAN}
- ${MINSTALL} ${page:T:S/$/${CATEXT}/} \
- ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
+.for __page in ${MAN}
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
.endfor
.endif
.endif
.else
-.for page in ${MAN}
- ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
- ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
+.for __page in ${MAN}
+ ${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
+ ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
+ ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
+ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
.endif
.endfor
.endif
@@ -239,9 +239,9 @@
manlint:
.if defined(MAN) && !empty(MAN)
-.for page in ${MAN}
-manlint: ${page}lint
-${page}lint: ${page}
+.for __page in ${MAN}
+manlint: ${__page}lint
+${__page}lint: ${__page}
.if defined(MANFILTER)
${MANFILTER} < ${.ALLSRC} | ${MROFF_CMD} -ww -z
.else
Index: Makefile
===================================================================
RCS file: /home/cvs/src/share/mk/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L share/mk/Makefile -L share/mk/Makefile -u -r1.3 -r1.4
--- share/mk/Makefile
+++ share/mk/Makefile
@@ -8,8 +8,9 @@
FILES+= bsd.kmod.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.snmpmod.mk bsd.subdir.mk bsd.sys.mk bsd.symver.mk
+FILES+= bsd.port.mk bsd.port.options.mk bsd.port.post.mk
+FILES+= bsd.port.pre.mk bsd.port.subdir.mk bsd.prog.mk
+FILES+= bsd.snmpmod.mk bsd.subdir.mk bsd.sys.mk bsd.symver.mk
FILES+= sys.mk version_gen.awk
NO_OBJ=
FILESDIR= ${BINDIR}/mk
Index: bsd.info.mk
===================================================================
RCS file: /home/cvs/src/share/mk/bsd.info.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -L share/mk/bsd.info.mk -L share/mk/bsd.info.mk -u -r1.3 -r1.4
--- share/mk/bsd.info.mk
+++ share/mk/bsd.info.mk
@@ -54,8 +54,6 @@
#
# MAKEINFOFLAGS Options for ${MAKEINFO} command. [--no-split]
#
-# NO_INFO Do not make or install info files. [not set]
-#
# NO_INFOCOMPRESS If you do not want info files be
# compressed when they are installed. [not set]
#
@@ -124,7 +122,7 @@
IFILENS+= ${INFO:S/$/.${_f}/}
.endfor
-.if !defined(NO_INFO)
+.if ${MK_INFO} != "no"
CLEANFILES+= ${IFILENS}
.if !defined(NO_INFOCOMPRESS)
CLEANFILES+= ${IFILENS:S/$/${ICOMPRESS_EXT}/}
@@ -146,11 +144,18 @@
.for x in ${INFO}
INSTALLINFODIRS+= ${x:S/$/-install/}
${x:S/$/-install/}:
+.if !empty(.MAKEFLAGS:M-j)
lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
${INSTALLINFO} ${INSTALLINFOFLAGS} \
--defsection=${INFOSECTION} \
--defentry=${INFOENTRY_${x}} \
${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+.else
+ ${INSTALLINFO} ${INSTALLINFOFLAGS} \
+ --defsection=${INFOSECTION} \
+ --defentry=${INFOENTRY_${x}} \
+ ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
+.endif
.endfor
.PHONY: ${INSTALLINFODIRS}
@@ -173,7 +178,7 @@
CLEANFILES+= ${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/}
.endif
-.if !defined(NO_INFO) && defined(INFO)
+.if ${MK_INFO} != "no" && defined(INFO)
install: ${INSTALLINFODIRS}
.if !empty(IFILES:N*.html)
${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \
More information about the Midnightbsd-cvs
mailing list