INCSLINKS cannot be used to make softlinks within machine/ because
authorMatthew Dillon <dillon@dragonflybsd.org>
Mon, 17 May 2004 01:03:54 +0000 (01:03 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Mon, 17 May 2004 01:03:54 +0000 (01:03 +0000)
buildworld's temporary include hierarchy uses a softlink into the source
tree for machine/ (so read only mounts of /usr/src would fail).

Instead, we will require that buildworld properly reference the include
files in their natural locations (e.g. <dev/video/...) and we fix the
softlinks in the make upgrade (upgrade_etc) target.

etc/Makefile
include/Makefile

index f0f9374..1428b1a 100644 (file)
@@ -1,6 +1,6 @@
 #      from: @(#)Makefile      5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.18 2004/04/12 16:29:05 dillon Exp $
+# $DragonFly: src/etc/Makefile,v 1.19 2004/05/17 01:03:52 dillon Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=        sendmail
@@ -93,6 +93,10 @@ upgrade_etc:
 .if !defined(NOMAN)
        cd ${.CURDIR}/../share/man; ${MAKE} makedb
 .endif
+       rm -f ${DESTDIR}/usr/include/machine/ioctl_meteor.h
+       rm -f ${DESTDIR}/usr/include/machine/ioctl_bt848.h
+       ln -s "../dev/video/bktr/ioctl_bt848.h" ${DESTDIR}/usr/include/machine/ioctl_bt848.h
+       ln -s "../dev/video/meteor/ioctl_meteor.h" ${DESTDIR}/usr/include/machine/ioctl_meteor.h
 .if exists(${DESTDIR}/usr/libexec/binutils212/elf/as)
        ldconfig -m ${DESTDIR}/usr/lib/gcc2
        rm -rf ${DESTDIR}/usr/libdata/ldscripts
@@ -143,6 +147,7 @@ distribution:
        cd ${.CURDIR}/isdn; ${MAKE} install
 .endif
 .if !defined(NO_SENDMAIL)
+       cd ${.CURDIR}/sendmail; ${MAKE} obj
        cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
 .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL)
index e81c8d4..772008b 100644 (file)
@@ -1,6 +1,6 @@
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $
-# $DragonFly: src/include/Makefile,v 1.18 2004/05/15 18:12:01 joerg Exp $
+# $DragonFly: src/include/Makefile,v 1.19 2004/05/17 01:03:54 dillon Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -135,9 +135,9 @@ INCSLINKS+= netproto/ncp ${INCLUDEDIR}/netncp
 INCSLINKS+=    netproto/ns ${INCLUDEDIR}/netns
 INCSLINKS+=    netproto/smb ${INCLUDEDIR}/netsmb
 INCSLINKS+=    bus/pccard ${INCLUDEDIR}/pccard
-# this is for TV apps from ports.
-INCSLINKS+=    ../dev/video/bktr/ioctl_bt848.h ${INCLUDEDIR}/machine/ioctl_bt848.h
-INCSLINKS+=    ../dev/video/meteor/ioctl_meteor.h ${INCLUDEDIR}/machine/ioctl_meteor.h
+# warning, we cannot softlink through ${INCLUDEDIR}/machine/... because
+# machine itself is a softlink into the source tree in buildworld's 
+# temporary include hierarchy.
 
 mtree_setup:
 .for i in ${LDIRS} ${LSYMSUBDIRS} ${LSYMSUBDIRS3} machine crypto