Now that we have real build system support for syspkgs, remove someone's
half-implemented idea of building `syspkgs' (really a few giant blobs of the same granularity of the old sets) using install(1).
This commit is contained in:
jwise
parent
751e656b13
commit
8bc0f5da0f
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.doc.mk,v 1.63 2004/01/29 01:48:45 lukem Exp $
|
||||
# $NetBSD: bsd.doc.mk,v 1.64 2006/03/16 18:43:34 jwise Exp $
|
||||
# @(#)bsd.doc.mk 8.1 (Berkeley) 8/14/93
|
||||
|
||||
.include <bsd.init.mk>
|
||||
@ -26,7 +26,7 @@ docinstall:: # ensure existence
|
||||
|
||||
__docinstall: .USE
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_FILE} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} ${SYSPKGTAG} \
|
||||
${INSTALL_FILE} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
FILES?= ${SRCS}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.inc.mk,v 1.31 2004/07/06 12:07:34 mycroft Exp $
|
||||
# $NetBSD: bsd.inc.mk,v 1.32 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
@ -17,9 +17,9 @@ __incinstall: .USE
|
||||
@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
|
||||
(${_MKSHMSG_INSTALL} ${.TARGET}; \
|
||||
${_MKSHECHO} "${INSTALL_FILE} -c -o ${BINOWN} -g ${BINGRP} \
|
||||
-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
|
||||
-m ${NONBINMODE} ${.ALLSRC} ${.TARGET}" && \
|
||||
${INSTALL_FILE} -c -o ${BINOWN} -g ${BINGRP} \
|
||||
-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET})
|
||||
-m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
|
||||
|
||||
.for F in ${INCS:O:u}
|
||||
_FDIR:= ${INCSDIR_${F:C,/,_,g}:U${INCSDIR}} # dir override
|
||||
@ -51,7 +51,7 @@ inclinkinstall: .PHONY
|
||||
continue ; \
|
||||
fi ; \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
|
||||
${INSTALL_SYMLINK} $$l $$t; \
|
||||
done; )
|
||||
.endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.info.mk,v 1.37 2004/01/29 01:48:45 lukem Exp $
|
||||
# $NetBSD: bsd.info.mk,v 1.38 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
@ -42,7 +42,7 @@ __infoinstall: .USE
|
||||
-o ${INFOOWN_${.ALLSRC:T}:U${INFOOWN}} \
|
||||
-g ${INFOGRP_${.ALLSRC:T}:U${INFOGRP}} \
|
||||
-m ${INFOMODE_${.ALLSRC:T}:U${INFOMODE}} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${.ALLSRC} ${.TARGET}
|
||||
@[ -f ${INFODIRFILE} ] && \
|
||||
while ! ln ${INFODIRFILE} ${INFODIRFILE}.lock 2> /dev/null; \
|
||||
do sleep 1; done; \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.kinc.mk,v 1.35 2004/01/29 01:48:45 lukem Exp $
|
||||
# $NetBSD: bsd.kinc.mk,v 1.36 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
# Variables:
|
||||
#
|
||||
@ -34,9 +34,9 @@ ${DESTDIR}${INCSDIR}: .EXEC
|
||||
${_MKSHMSG_CREATE} ${.TARGET}; \
|
||||
/bin/rm -rf ${.TARGET}; \
|
||||
${_MKSHECHO} ${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${SYSPKGTAG} ${.TARGET}; \
|
||||
${.TARGET}; \
|
||||
${INSTALL_DIR} -o ${BINOWN} -g ${BINGRP} -m 755 \
|
||||
${SYSPKGTAG} ${.TARGET}; \
|
||||
${.TARGET}; \
|
||||
fi
|
||||
|
||||
# -c is forced on here, in order to preserve modtimes for "make depend"
|
||||
@ -44,9 +44,9 @@ __incinstall: .USE
|
||||
@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
|
||||
(${_MKSHMSG_INSTALL} ${.TARGET}; \
|
||||
${_MKSHECHO} "${INSTALL_FILE} -c -o ${BINOWN} -g ${BINGRP} \
|
||||
-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}" && \
|
||||
-m ${NONBINMODE} ${.ALLSRC} ${.TARGET}" && \
|
||||
${INSTALL_FILE} -c -o ${BINOWN} -g ${BINGRP} \
|
||||
-m ${NONBINMODE} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET})
|
||||
-m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
|
||||
|
||||
.for F in ${INCS:O:u} ${DEPINCS:O:u}
|
||||
_F:= ${DESTDIR}${INCSDIR}/${F} # installed path
|
||||
@ -74,8 +74,8 @@ incinstall::
|
||||
continue ; \
|
||||
fi ; \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
|
||||
${INSTALL_SYMLINK} $$l $$t; \
|
||||
done; )
|
||||
.endif
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.kmod.mk,v 1.77 2004/06/10 00:29:59 lukem Exp $
|
||||
# $NetBSD: bsd.kmod.mk,v 1.78 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
@ -136,7 +136,7 @@ ${_PROG}: .MADE # no build at install
|
||||
.endif
|
||||
.endif
|
||||
${INSTALL_FILE} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
kmodinstall:: ${_PROG}
|
||||
.PHONY: kmodinstall
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.lib.mk,v 1.263 2006/01/28 11:10:18 dsl Exp $
|
||||
# $NetBSD: bsd.lib.mk,v 1.264 2006/03/16 18:43:34 jwise Exp $
|
||||
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
|
||||
|
||||
.include <bsd.init.mk>
|
||||
@ -383,12 +383,12 @@ __archivebuild: .USE
|
||||
__archiveinstall: .USE
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${UPDATE:D:U-a "${RANLIB} -t"} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${UPDATE:D:U-a "${RANLIB} -t"} ${.ALLSRC} ${.TARGET}
|
||||
.endif
|
||||
|
||||
__archivesymlinkpic: .USE
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${INSTALL_SYMLINK} ${.ALLSRC} ${.TARGET}
|
||||
|
||||
DPSRCS+= ${_YLSRCS}
|
||||
CLEANFILES+= ${_YLSRCS}
|
||||
@ -539,9 +539,9 @@ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_F
|
||||
.endif
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${.ALLSRC} ${.TARGET}
|
||||
.if ${_LIBSODIR} != ${LIBDIR}
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} \
|
||||
${INSTALL_SYMLINK} \
|
||||
-l r ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
|
||||
${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_FULLVERSION}
|
||||
.endif
|
||||
@ -549,20 +549,20 @@ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_F
|
||||
/sbin/ldconfig -m ${_LIBSODIR} ${LIBDIR}
|
||||
.endif
|
||||
.if ${OBJECT_FMT} == "ELF"
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} \
|
||||
${INSTALL_SYMLINK} \
|
||||
lib${LIB}.so.${SHLIB_FULLVERSION} \
|
||||
${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_MAJOR}
|
||||
.if ${_LIBSODIR} != ${LIBDIR}
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} \
|
||||
${INSTALL_SYMLINK} \
|
||||
${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
|
||||
${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}
|
||||
.endif
|
||||
.if ${MKLINKLIB} != "no"
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} \
|
||||
${INSTALL_SYMLINK} \
|
||||
lib${LIB}.so.${SHLIB_FULLVERSION} \
|
||||
${DESTDIR}${_LIBSODIR}/lib${LIB}.so
|
||||
.if ${_LIBSODIR} != ${LIBDIR}
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} \
|
||||
${INSTALL_SYMLINK} \
|
||||
-l r ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION} \
|
||||
${DESTDIR}${LIBDIR}/lib${LIB}.so
|
||||
.endif
|
||||
@ -587,7 +587,7 @@ ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln: llib-l${LIB}.ln
|
||||
.endif
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
|
||||
${.ALLSRC} ${DESTDIR}${LINTLIBDIR}
|
||||
.endif
|
||||
.endif # !target(libinstall) # }
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.links.mk,v 1.30 2005/08/31 05:08:24 lukem Exp $
|
||||
# $NetBSD: bsd.links.mk,v 1.31 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
@ -22,8 +22,8 @@ linksinstall:: realinstall
|
||||
continue ; \
|
||||
fi ; \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
|
||||
${INSTALL_SYMLINK} $$l $$t; \
|
||||
done; )
|
||||
.endif
|
||||
.if !empty(LINKS)
|
||||
@ -37,8 +37,8 @@ linksinstall:: realinstall
|
||||
continue ; \
|
||||
fi ; \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${INSTALL_LINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} $$l $$t; \
|
||||
${INSTALL_LINK} $$l $$t; \
|
||||
done ; )
|
||||
.endif
|
||||
|
||||
@ -56,8 +56,8 @@ configlinksinstall:: configfilesinstall
|
||||
continue ; \
|
||||
fi ; \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${INSTALL_SYMLINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
|
||||
${INSTALL_SYMLINK} $$l $$t; \
|
||||
done; )
|
||||
.endif
|
||||
.if defined(CONFIGLINKS) && !empty(CONFIGLINKS)
|
||||
@ -71,8 +71,8 @@ configlinksinstall:: configfilesinstall
|
||||
continue ; \
|
||||
fi ; \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${INSTALL_LINK} ${SYSPKGTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} $$l $$t; \
|
||||
${INSTALL_LINK} $$l $$t; \
|
||||
done ; )
|
||||
.endif
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.man.mk,v 1.94 2005/04/19 08:41:37 tron Exp $
|
||||
# $NetBSD: bsd.man.mk,v 1.95 2006/03/16 18:43:34 jwise Exp $
|
||||
# @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93
|
||||
|
||||
.include <bsd.init.mk>
|
||||
@ -46,9 +46,9 @@ __installpage: .USE
|
||||
@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
|
||||
(${_MKSHMSG_INSTALL} ${.TARGET}; \
|
||||
${_MKSHECHO} "${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
|
||||
${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET}" && \
|
||||
${.ALLSRC} ${.TARGET}" && \
|
||||
${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
|
||||
${SYSPKGDOCTAG} ${.ALLSRC} ${.TARGET})
|
||||
${.ALLSRC} ${.TARGET})
|
||||
|
||||
##### Build and install rules (source form pages)
|
||||
|
||||
@ -97,8 +97,8 @@ manlinks: .PHONY manpages # symlink install
|
||||
t=$${dir}${MANSUBDIR}/$${name}${MANSUFFIX}; \
|
||||
if test $$l -nt $$t -o ! -f $$t; then \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
|
||||
${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} $$l $$t; \
|
||||
${INSTALL_LINK} $$l $$t; \
|
||||
fi; \
|
||||
done
|
||||
.endif
|
||||
@ -158,8 +158,8 @@ catlinks: .PHONY catpages # symlink install
|
||||
t=$${dir}${MANSUBDIR}/$${name%.*}.0${MANSUFFIX}; \
|
||||
if test $$l -nt $$t -o ! -f $$t; then \
|
||||
${_MKSHMSG_INSTALL} $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
|
||||
${INSTALL_LINK} ${SYSPKGDOCTAG} $$l $$t; \
|
||||
${_MKSHECHO} ${INSTALL_LINK} $$l $$t; \
|
||||
${INSTALL_LINK} $$l $$t; \
|
||||
fi; \
|
||||
done
|
||||
.endif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.nls.mk,v 1.45 2004/01/29 01:48:45 lukem Exp $
|
||||
# $NetBSD: bsd.nls.mk,v 1.46 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
@ -37,7 +37,7 @@ nlsinstall:: # ensure existence
|
||||
__nlsinstall: .USE
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_FILE} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
.for F in ${NLSALL:O:u}
|
||||
_F:= ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat # installed path
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.own.mk,v 1.441 2005/08/17 07:13:32 skrll Exp $
|
||||
# $NetBSD: bsd.own.mk,v 1.442 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.if !defined(_BSD_OWN_MK_)
|
||||
_BSD_OWN_MK_=1
|
||||
@ -650,8 +650,6 @@ INSTPRIV.unpriv=
|
||||
.endif
|
||||
INSTPRIV?= ${INSTPRIV.unpriv} -N ${NETBSDSRCDIR}/etc
|
||||
.endif
|
||||
SYSPKGTAG?= ${SYSPKG:D-T ${SYSPKG}_pkg}
|
||||
SYSPKGDOCTAG?= ${SYSPKG:D-T ${SYSPKG}-doc_pkg}
|
||||
STRIPFLAG?=
|
||||
|
||||
.if ${NEED_OWN_INSTALL_TARGET} != "no"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.prog.mk,v 1.208 2006/01/20 16:54:11 christos Exp $
|
||||
# $NetBSD: bsd.prog.mk,v 1.209 2006/03/16 18:43:34 jwise Exp $
|
||||
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
|
||||
|
||||
.ifndef HOSTPROG
|
||||
@ -239,7 +239,7 @@ proginstall:: ${DESTDIR}${BINDIR}/${PROGNAME}
|
||||
__proginstall: .USE
|
||||
${_MKTARGET_INSTALL}
|
||||
${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
|
||||
${STRIPFLAG} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${STRIPFLAG} ${.ALLSRC} ${.TARGET}
|
||||
|
||||
.if ${MKUPDATE} == "no"
|
||||
${DESTDIR}${BINDIR}/${PROGNAME}! ${PROG} __proginstall
|
||||
@ -274,7 +274,7 @@ __scriptinstall: .USE
|
||||
-o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
|
||||
-g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
|
||||
-m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
.for S in ${SCRIPTS:O:u}
|
||||
.if ${MKUPDATE} == "no"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $NetBSD: bsd.x11.mk,v 1.51 2005/11/12 22:57:46 spz Exp $
|
||||
# $NetBSD: bsd.x11.mk,v 1.52 2006/03/16 18:43:34 jwise Exp $
|
||||
|
||||
.include <bsd.init.mk>
|
||||
|
||||
@ -144,7 +144,7 @@ appdefsinstall:: .PHONY ${APPDEFS:@S@${DESTDIR}${X11LIBDIR}/app-defaults/${S:T:R
|
||||
|
||||
__appdefinstall: .USE
|
||||
${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
|
||||
${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
|
||||
${.ALLSRC} ${.TARGET}
|
||||
|
||||
.for S in ${APPDEFS:O:u}
|
||||
${DESTDIR}${X11LIBDIR}/app-defaults/${S:T:R}: ${S} __appdefinstall
|
||||
|
||||
Loading…
Reference in New Issue
Block a user