diff options
| author | joerg <joerg> | 2009-10-06 14:57:28 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-10-06 14:57:28 +0000 |
| commit | 4a1901852e5483e7f57c9b27347567c634b17f51 (patch) | |
| tree | 6905e36cddbaf9092b2ae7b2a615784835ef87a5 /devel/gnustep-make | |
| parent | 5dae0e366d59e47f3558926d18b944606cde14f3 (diff) | |
| download | pkgsrc-4a1901852e5483e7f57c9b27347567c634b17f51.tar.gz | |
Don't use the buildlink fake gnustep directory here as it would leak
the build path into the binary package. Bump revision.
Diffstat (limited to 'devel/gnustep-make')
| -rw-r--r-- | devel/gnustep-make/Makefile | 6 | ||||
| -rw-r--r-- | devel/gnustep-make/gnustep.mk | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 29676ba9c0d..26c789c50aa 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2009/06/13 06:46:42 rillig Exp $ +# $NetBSD: Makefile,v 1.49 2009/10/06 14:57:28 joerg Exp $ DISTNAME= gnustep-make-2.0.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} @@ -22,6 +22,8 @@ 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 f085d3bffb8..f9ad24434c1 100644 --- a/devel/gnustep-make/gnustep.mk +++ b/devel/gnustep-make/gnustep.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnustep.mk,v 1.17 2009/04/20 05:51:00 rh Exp $ +# $NetBSD: gnustep.mk,v 1.18 2009/10/06 14:57:28 joerg Exp $ .if !defined(GNUSTEP_MK) GNUSTEP_MK= #defined @@ -21,7 +21,11 @@ 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 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 |