[pkgsrc/trunk]: pkgsrc/devel/gnustep-make Properly accommodate GNUstep packag...

[rh <rh%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d2a863b12bb
branches:  trunk
changeset: 492963:1d2a863b12bb
user:      rh <rh%pkgsrc.org@localhost>
date:      Sun Apr 24 02:47:03 2005 +0000

description:
Properly accommodate GNUstep packages that use a non-GNU configure.

diffstat:

 devel/gnustep-make/gnustep.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 74beab693e66 -r 1d2a863b12bb devel/gnustep-make/gnustep.mk
--- a/devel/gnustep-make/gnustep.mk     Sat Apr 23 20:39:50 2005 +0000
+++ b/devel/gnustep-make/gnustep.mk     Sun Apr 24 02:47:03 2005 +0000
@@ -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=      GNUmakefile
 .endif
 
-.if !defined(NO_CONFIGURE)
+.if !defined(NO_CONFIGURE) && !defined(HAS_CONFIGURE)
 GNU_CONFIGURE= yes
 .endif
 
@@ -70,7 +70,7 @@
 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}"