Date: 18 Mar 2002 02:32:23 +0100 From: Dag-Erling Smorgrav <des@ofug.org> To: arch@freebsd.org Subject: bsd.lib.mk modifications Message-ID: <xzpzo16r788.fsf@flood.ping.uio.no>
next in thread | raw e-mail | index | archive | help
--=-=-=
The attached patch changes the following in bsd.lib.mk:
- add an INCSUBDIR variable so that libraries that install their
headers in a subdirectory of /usr/include don't have to override
the beforeinstall target.
- make ${INCS} a prerequisite of _includeinstall so generated headers
will be built in time for beforeinstall (again, to avoid overriding
beforeinstall).
- install static libraries with -C, like headers, since it is common
for programs and libraries to depend on them.
I haven't put this through buildworld yet, but I'm reasonably
confident it'll pass the test.
Comments? Objections?
DES
--
Dag-Erling Smorgrav - des@ofug.org
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=incsubdir.diff
Index: bsd.lib.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.lib.mk,v
retrieving revision 1.103
diff -u -r1.103 bsd.lib.mk
--- bsd.lib.mk 12 Mar 2002 01:18:07 -0000 1.103
+++ bsd.lib.mk 18 Mar 2002 01:15:27 -0000
@@ -261,12 +261,12 @@
beforeinstall: _includeinstall
.endif
-_includeinstall:
+_includeinstall: ${INCS}
.if defined(INCS)
.for header in ${INCS}
cd ${.CURDIR} && \
${INSTALL} -C -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
- ${header} ${DESTDIR}${INCDIR}
+ ${header} ${DESTDIR}${INCDIR}/${INCSUBDIR}
.endfor
.endif
@@ -286,7 +286,7 @@
realinstall: beforeinstall
.if !defined(INTERNALLIB)
- ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
.if !defined(NOPROFILE)
${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
--=-=-=--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpzo16r788.fsf>