Tag the metalog with a global default sets of tags that will be used to decide
what will go in which package, more finer grain tagging to come
This commit is contained in:
+2
-2
@@ -135,11 +135,11 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
|
||||
realinstall:
|
||||
.for _dev in ${PRINTERDEVICE:Mhtml}
|
||||
cd ${SRCDIR}; \
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${INSTALL} -T docs -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
|
||||
.endfor
|
||||
.for _dev in ${PRINTERDEVICE:Nhtml}
|
||||
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${INSTALL} -T docs -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
|
||||
.endfor
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ ${group}NAME_${file:T}?= ${file:T}
|
||||
.endif
|
||||
installfiles-${group}: _${group}INS_${file:T}
|
||||
_${group}INS_${file:T}: ${file}
|
||||
${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
${INSTALL} -T runtime -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
||||
${.ALLSRC} \
|
||||
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
|
||||
@@ -52,11 +52,11 @@ _${group}FILES+= ${file}
|
||||
installfiles-${group}: _${group}INS
|
||||
_${group}INS: ${_${group}FILES}
|
||||
.if defined(${group}NAME)
|
||||
${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
|
||||
${INSTALL} -T runtime -o ${${group}OWN} -g ${${group}GRP} \
|
||||
-m ${${group}MODE} ${.ALLSRC} \
|
||||
${DESTDIR}${${group}DIR}/${${group}NAME}
|
||||
.else
|
||||
${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
|
||||
${INSTALL} -T runtime -o ${${group}OWN} -g ${${group}GRP} \
|
||||
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
@@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T}
|
||||
.endif
|
||||
installincludes: _${group}INS_${header:T}
|
||||
_${group}INS_${header:T}: ${header}
|
||||
${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
${INSTALL} -T development -C -o ${${group}OWN_${.ALLSRC:T}} \
|
||||
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
|
||||
${.ALLSRC} \
|
||||
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
|
||||
@@ -53,10 +53,10 @@ _${group}INCS+= ${header}
|
||||
installincludes: _${group}INS
|
||||
_${group}INS: ${_${group}INCS}
|
||||
.if defined(${group}NAME)
|
||||
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${INSTALL} -T development -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
|
||||
.else
|
||||
${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${INSTALL} -T development -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
|
||||
${.ALLSRC} ${DESTDIR}${${group}DIR}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
+9
-9
@@ -223,7 +223,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
|
||||
@${ECHO} building shared library ${SHLIB_NAME}
|
||||
@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
|
||||
.if defined(SHLIB_LINK)
|
||||
@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
|
||||
@${INSTALL_SYMLINK} -T development ${SHLIB_NAME} ${SHLIB_LINK}
|
||||
.endif
|
||||
.if !defined(NM)
|
||||
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
|
||||
@@ -313,15 +313,15 @@ realinstall: _libinstall
|
||||
.ORDER: beforeinstall _libinstall
|
||||
_libinstall:
|
||||
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" && !defined(PRIVATELIB)
|
||||
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${INSTALL} -T development -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
|
||||
.endif
|
||||
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) && !defined(PRIVATELIB)
|
||||
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${INSTALL} -T profile -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
|
||||
.endif
|
||||
.if defined(SHLIB_NAME)
|
||||
${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${INSTALL} -T runtime ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
|
||||
${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
|
||||
.if ${MK_DEBUG_FILES} != "no"
|
||||
@@ -354,16 +354,16 @@ _libinstall:
|
||||
sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
|
||||
-e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
|
||||
${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
|
||||
${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${INSTALL} -T development -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
|
||||
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
|
||||
rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
|
||||
|
||||
.else
|
||||
.if ${_SHLIBDIR} == ${_LIBDIR}
|
||||
${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
|
||||
${INSTALL_SYMLINK} -T development ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
|
||||
.else
|
||||
${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \
|
||||
${INSTALL_SYMLINK} -T development ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \
|
||||
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
|
||||
.if exists(${DESTDIR}${_LIBDIR}/${SHLIB_NAME})
|
||||
-chflags noschg ${DESTDIR}${_LIBDIR}/${SHLIB_NAME}
|
||||
@@ -374,11 +374,11 @@ _libinstall:
|
||||
.endif # SHLIB_LINK
|
||||
.endif # SHIB_NAME
|
||||
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" && !defined(PRIVATELIB)
|
||||
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${INSTALL} -T development -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
|
||||
.endif
|
||||
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
|
||||
${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${INSTALL} -T development -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
|
||||
.endif
|
||||
.endif # !defined(INTERNALLIB)
|
||||
|
||||
@@ -15,7 +15,7 @@ _installlinks:
|
||||
t=${DESTDIR}$$1; \
|
||||
shift; \
|
||||
${ECHO} $$t -\> $$l; \
|
||||
${INSTALL_LINK} $$l $$t; \
|
||||
${INSTALL_LINK} -T runtime $$l $$t; \
|
||||
done; true
|
||||
.endif
|
||||
.if defined(SYMLINKS) && !empty(SYMLINKS)
|
||||
@@ -26,6 +26,6 @@ _installlinks:
|
||||
t=${DESTDIR}$$1; \
|
||||
shift; \
|
||||
${ECHO} $$t -\> $$l; \
|
||||
${INSTALL_SYMLINK} $$l $$t; \
|
||||
${INSTALL_SYMLINK} -T runtime $$l $$t; \
|
||||
done; true
|
||||
.endif
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@
|
||||
.error bsd.man.mk cannot be included directly.
|
||||
.endif
|
||||
|
||||
MINSTALL?= ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
|
||||
MINSTALL?= ${INSTALL} -T runtime -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
|
||||
|
||||
CATDIR= ${MANDIR:H:S/$/\/cat/}
|
||||
CATEXT= .cat
|
||||
|
||||
@@ -201,7 +201,7 @@ realinstall: _proginstall
|
||||
.ORDER: beforeinstall _proginstall
|
||||
_proginstall:
|
||||
.if defined(PROG)
|
||||
${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${INSTALL} -T runtime ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
|
||||
.if ${MK_DEBUG_FILES} != "no"
|
||||
.if defined(DEBUGMKDIR)
|
||||
@@ -234,7 +234,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
|
||||
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
|
||||
_scriptsinstall: _SCRIPTSINS_${script:T}
|
||||
_SCRIPTSINS_${script:T}: ${script}
|
||||
${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
|
||||
${INSTALL} -T runtime -o ${SCRIPTSOWN_${.ALLSRC:T}} \
|
||||
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
|
||||
${.ALLSRC} \
|
||||
${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}/${SCRIPTSNAME_${.ALLSRC:T}}
|
||||
|
||||
Reference in New Issue
Block a user