summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorrh <rh>2005-04-24 02:47:03 +0000
committerrh <rh>2005-04-24 02:47:03 +0000
commit97b8a6d3ce68dd090994f8e64aef226ac5d06050 (patch)
treea6a45c41f82804bb35a72ad5c397e6c017f3aa54 /devel
parent1f40728b7af3fc194f960324186fb6397a4769b9 (diff)
downloadpkgsrc-97b8a6d3ce68dd090994f8e64aef226ac5d06050.tar.gz
Properly accommodate GNUstep packages that use a non-GNU configure.
Diffstat (limited to 'devel')
-rw-r--r--devel/gnustep-make/gnustep.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 470075b910d..766d6ba2b4e 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.2 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: gnustep.mk,v 1.3 2005/04/24 02:47:03 rh Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -52,7 +52,7 @@ MAKEFILE= ${GNUSTEP_MAKEFILE}
MAKEFILE= GNUmakefile
.endif
-.if !defined(NO_CONFIGURE)
+.if !defined(NO_CONFIGURE) && !defined(HAS_CONFIGURE)
GNU_CONFIGURE= yes
.endif
@@ -70,7 +70,7 @@ MAKE_ENV+= GNUSTEP_PATHLIST="${GNUSTEP_PATHLIST}"
MAKE_ENV+= GNUSTEP_FLATTENED="${GNUSTEP_FLATTENED}"
MAKE_ENV+= GUILE_LOAD_PATH="${GUILE_LOAD_PATH}"
-.if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE)
GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT}
CONFIGURE_ENV+= GNUSTEP_ROOT="${GNUSTEP_ROOT}"
CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"