From ac65029a3155be15af37faa62f8c5dc273088033 Mon Sep 17 00:00:00 2001 From: rh Date: Tue, 6 May 2003 05:39:19 +0000 Subject: Add GNUSTEP_HOST_OS to PLIST_SUBST. --- devel/gnustep-make/buildlink2.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'devel/gnustep-make') diff --git a/devel/gnustep-make/buildlink2.mk b/devel/gnustep-make/buildlink2.mk index 5aaee427541..31213bc304f 100644 --- a/devel/gnustep-make/buildlink2.mk +++ b/devel/gnustep-make/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2003/04/01 08:29:12 rh Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2003/05/06 05:39:19 rh Exp $ # .if !defined(GNUSTEP_MAKE_BUILDLINK2_MK) @@ -21,7 +21,11 @@ GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM} GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR} +.if (${MACHINE_ARCH} == "i386") GNUSTEP_HOST_OS= ${LOWER_OPSYS}${APPEND_ELF} +.else +GNUSTEP_HOST_OS= ${LOWER_OPSYS} +.endif GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_NETWORK_ROOT}:${GNUSTEP_SYSTEM_ROOT} GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_LOCAL_ROOT}/Tools:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_LOCAL_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_NETWORK_ROOT}/Tools:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_NETWORK_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:${GNUSTEP_SYSTEM_ROOT}/Tools:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu:${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} @@ -45,6 +49,7 @@ MAKE_ENV+= GNUSTEP_FLATTENED="" MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}" PLIST_SUBST+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU} +PLIST_SUBST+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS} PLIST_SUBST+= APPEND_ELF=${APPEND_ELF} .if defined(GNU_CONFIGURE) -- cgit v1.2.3