diff options
| author | wiz <wiz> | 2001-03-10 21:15:26 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2001-03-10 21:15:26 +0000 |
| commit | d411c79709c5f94b301f021b4d8810db60b87825 (patch) | |
| tree | 455d3ccd257a90090cebca2a52d5d1bc2b6292ce /cross/i386-netbsdpe | |
| parent | 2115d20f9d1865ab448ea16fe395156973e66a12 (diff) | |
| download | pkgsrc-d411c79709c5f94b301f021b4d8810db60b87825.tar.gz | |
Purely automatic replacement: SYS_INCLUDE -> CROSS_SYS_INCLUDE.
Fixes pkg/7006.
Diffstat (limited to 'cross/i386-netbsdpe')
| -rw-r--r-- | cross/i386-netbsdpe/Makefile | 10 | ||||
| -rw-r--r-- | cross/i386-netbsdpe/files/cross.mk | 19 |
2 files changed, 15 insertions, 14 deletions
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile index 8af7b660530..aa7c6539d02 100644 --- a/cross/i386-netbsdpe/Makefile +++ b/cross/i386-netbsdpe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/03/08 10:17:11 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2001/03/10 21:15:27 wiz Exp $ # DISTVERSION= 1.1.4 @@ -57,10 +57,10 @@ post-patch: CFLAGS_FOR_TARGET+= -I${WRKDIR} post-configure: - ${CP} ${FILESDIR}/i386_limits.h ${SYS_INCLUDE}/machine/limits.h - ${CP} ${FILESDIR}/syslimits.h ${SYS_INCLUDE}/sys/ - ${CP} ${FILESDIR}/featuretest.h ${SYS_INCLUDE}/sys/ - ${CP} ${FILESDIR}/limits.h ${SYS_INCLUDE}/ + ${CP} ${FILESDIR}/i386_limits.h ${CROSS_SYS_INCLUDE}/machine/limits.h + ${CP} ${FILESDIR}/syslimits.h ${CROSS_SYS_INCLUDE}/sys/ + ${CP} ${FILESDIR}/featuretest.h ${CROSS_SYS_INCLUDE}/sys/ + ${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/ ${RM} ${WRKDIR}/${GCC_DISTNAME}/texinfo/makeinfo/Makefile ${SED} "s/extern FILE/__declspec(dllimport) FILE/" /usr/include/stdio.h > ${WRKDIR}/stdio.h diff --git a/cross/i386-netbsdpe/files/cross.mk b/cross/i386-netbsdpe/files/cross.mk index 1b26e1b2642..5ee654a7dd6 100644 --- a/cross/i386-netbsdpe/files/cross.mk +++ b/cross/i386-netbsdpe/files/cross.mk @@ -1,4 +1,4 @@ -# $NetBSD: cross.mk,v 1.5 2001/03/02 09:38:06 minoura Exp $ +# $NetBSD: cross.mk,v 1.6 2001/03/10 21:15:27 wiz Exp $ # $PEACE: cross.mk,v 1.1 2001/01/16 15:20:26 kent Exp $ # based on pkgsrc/cross/COMMON/cross.mk # NetBSD: cross.mk,v 1.16 2000/11/09 13:04:55 wiz Exp @@ -155,11 +155,11 @@ GCC_MAKE= ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} ${GCC_MAKE_FLAGS} .if defined(GCC_FAKE_RUNTIME) -SYS_INCLUDE= ${WRKDIR}/include +CROSS_SYS_INCLUDE= ${WRKDIR}/include .endif -.if defined(SYS_INCLUDE) -CFLAGS_FOR_TARGET+= -idirafter ${SYS_INCLUDE} -GCC_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${SYS_INCLUDE}" +.if defined(CROSS_SYS_INCLUDE) +CFLAGS_FOR_TARGET+= -idirafter ${CROSS_SYS_INCLUDE} +GCC_MAKE_FLAGS+= SYSTEM_HEADER_DIR="${CROSS_SYS_INCLUDE}" .endif .if defined(SYS_LIB) LDFLAGS_FOR_TARGET+= -L${SYS_LIB} @@ -186,8 +186,9 @@ gcc-configure: --host=${MACHINE_GNU_ARCH}--netbsd --target=${TARGET_ARCH} \ ${GCC_CONFIGURE_ARGS} ${CXX_CONFIGURE_ARGS} .if defined(GCC_FAKE_RUNTIME) - @${MKDIR} ${SYS_INCLUDE} ${SYS_INCLUDE}/machine ${SYS_INCLUDE}/sys - @cd ${SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \ + @${MKDIR} ${CROSS_SYS_INCLUDE} ${CROSS_SYS_INCLUDE}/machine \ + ${CROSS_SYS_INCLUDE}/sys + @cd ${CROSS_SYS_INCLUDE} && ${TOUCH} ${TOUCH_FLAGS} machine/ansi.h \ sys/time.h stdlib.h unistd.h .endif @@ -250,10 +251,10 @@ EXTRACT_ONLY= ${DISTFILES:N*.diff.gz} .endif .endif -.if defined(SYS_INCLUDE) && !defined(GCC_FAKE_RUNTIME) +.if defined(CROSS_SYS_INCLUDE) && !defined(GCC_FAKE_RUNTIME) pre-install: pre-install-includes pre-install-includes: - cd ${SYS_INCLUDE} && ${PAX} -rw . ${TARGET_DIR}/include + cd ${CROSS_SYS_INCLUDE} && ${PAX} -rw . ${TARGET_DIR}/include .endif .if defined(SYS_LIB) |