From f8317995a74f2e0c90c99d8bb3c1c7109e3bc43a Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 8 Oct 2009 12:49:27 +0000 Subject: Redo fix for leaking .buildlink references in a more generic fashion by using the real path in CPPFLAGS etc. The wrapper framework will translate those back. Add some more substitutions for additional directories to help other packages being destdir safe. --- devel/gnustep-make/Makefile | 4 +--- devel/gnustep-make/gnustep.mk | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'devel/gnustep-make') diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 26c789c50aa..1d8b7117fa9 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2009/10/06 14:57:28 joerg Exp $ +# $NetBSD: Makefile,v 1.50 2009/10/08 12:49:27 joerg Exp $ DISTNAME= gnustep-make-2.0.8 PKGREVISION= 3 @@ -22,8 +22,6 @@ CONFIGURE_ARGS+= --with-layout=fhs CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf MAKE_FILE= GNUmakefile -GNUSTEP_USE_REAL_USER_ROOT= # empty - CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \ ${PKG_SYSCONFDIR}/GNUstep.conf diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk index f9ad24434c1..1337738abcc 100644 --- a/devel/gnustep-make/gnustep.mk +++ b/devel/gnustep-make/gnustep.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnustep.mk,v 1.18 2009/10/06 14:57:28 joerg Exp $ +# $NetBSD: gnustep.mk,v 1.19 2009/10/08 12:49:27 joerg Exp $ .if !defined(GNUSTEP_MK) GNUSTEP_MK= #defined @@ -21,18 +21,15 @@ GNUSTEP_CONFIG_FILE= ${PKG_SYSCONFDIR}/GNUstep.conf GNUSTEP_FLATTENED= yes GNUSTEP_IS_FLATTENED= yes -.if defined(GNUSTEP_USE_REAL_USER_ROOT) -GNUSTEP_USER_ROOT= ${PREFIX}/share/GNUstep -.else +REAL_GNUSTEP_USER_ROOT= ${PREFIX}/share/GNUstep GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep -.endif GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT} GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} GUILE_LOAD_PATH= ${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_USER_ROOT}/lib GNUSTEP_LDIR= lib GNUSTEP_IDIR= include -GNUSTEP_LFLAGS= ${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_USER_ROOT:S/^/-L/}/${GNUSTEP_LDIR} -GNUSTEP_IFLAGS= ${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_USER_ROOT:S/^/-I/}/${GNUSTEP_IDIR} +GNUSTEP_LFLAGS= ${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${REAL_GNUSTEP_USER_ROOT:S/^/-L/}/${GNUSTEP_LDIR} +GNUSTEP_IFLAGS= ${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${REAL_GNUSTEP_USER_ROOT:S/^/-I/}/${GNUSTEP_IDIR} GNUSTEP_LDIRS= ${GNUSTEP_LFLAGS:S/-L//g} GNUSTEP_IDIRS= ${GNUSTEP_IFLAGS:S/-I//g} GNUSTEP_BLDIRS= ${GNUSTEP_LDIRS:S/${PREFIX}\///g} @@ -52,6 +49,9 @@ SUBST_SED.gnustep_installation_dir+= -e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTE SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME}|g' SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles|$${DESTDIR}${GNUSTEP_LIB_DIR}/Bundles|g' SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Library|$${DESTDIR}${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Library|g' +SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_USER_ROOT)/Library|$${DESTDIR}${GNUSTEP_USER_ROOT}/${GNUSTEP_SUBDIR}/Library|g' +SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_LOCAL_ROOT)/Library|$${DESTDIR}${GNUSTEP_LOCAL_ROOT}/${GNUSTEP_SUBDIR}/Library|g' +SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_NETWORK_ROOT)/Library|$${DESTDIR}${GNUSTEP_NETWORK_ROOT}/${GNUSTEP_SUBDIR}/Library|g' SUBST_SED.gnustep_installation_dir+= -e 's|INSTALL_ROOT_DIR|DESTDIR|g' .endif -- cgit v1.2.3