Date: Sun, 22 Oct 2000 06:47:04 +0900 From: "Akinori MUSHA" <knu@idaemons.org> To: freebsd-stable@FreeBSD.org, freebsd-ports@FreeBSD.org Cc: asami@FreeBSD.org Subject: Supporting INCS on 3-STABLE Message-ID: <86puktyihz.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
I was noticed that my textproc/expat port doesn't install header files
automatically on 3-STABLE because 3-STABLE's bsd.lib.mk doesn't
recognize INCS macro.
Now, can we merge the INCS support to 3-STABLE? I'm not saying that
we should modify src/lib/*/Makefile so they use INCS macro, but just
make bsd.lib.mk support the macro and leave src/lib/*/Makefile for
safety.
I found only one file defines INCS though the variable is not actually
used, and we can remove the definition.
If no one opposes and the merging is done, I hope bsd.lib.mk will be
included in the ports upgrade kits for 3.x.
Opinions?
Index: src/lib/libcom_err/Makefile
===================================================================
RCS file: /home/ncvs/src/lib/libcom_err/Makefile,v
retrieving revision 1.8.2.3
diff -u -r1.8.2.3 Makefile
--- src/lib/libcom_err/Makefile 2000/07/07 04:55:07 1.8.2.3
+++ src/lib/libcom_err/Makefile 2000/10/21 20:50:30
@@ -2,7 +2,6 @@
LIB= com_err
SRCS= com_err.c error.c
-INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
MAN3= com_err.3
COM_ERRDIR= ${.CURDIR}/../../contrib/com_err
CFLAGS+= -I${COM_ERRDIR}
Index: src/share/mk/bsd.lib.mk
===================================================================
RCS file: /home/ncvs/src/share/mk/bsd.lib.mk,v
retrieving revision 1.84.2.2
diff -u -r1.84.2.2 bsd.lib.mk
--- src/share/mk/bsd.lib.mk 1999/08/29 16:47:43 1.84.2.2
+++ src/share/mk/bsd.lib.mk 2000/10/21 20:48:46
@@ -259,7 +259,17 @@
.if !target(install)
.if !target(beforeinstall)
-beforeinstall:
+beforeinstall: _includeinstall
+.endif
+
+_includeinstall:
+.if defined(INCS)
+.for header in ${INCS}
+ cd ${.CURDIR} && \
+ ${INSTALL} -C -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \
+ ${header} ${DESTDIR}${INCDIR}
+
+.endfor
.endif
.if defined(PRECIOUSLIB)
--
/
/__ __
/ ) ) ) ) / and.or.jp / ruby-lang.org
Akinori -Aki- MUSHA aka / (_ / ( (__( @ idaemons.org / FreeBSD.org
"We're only at home when we're on the run, on the wing, on the fly"
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86puktyihz.wl>