Sun Apr 19 00:50:11 2009 UTC ()
Create Libraries directory for gnustep bundles.
Bump PKGREVISION.


(rh)
diff -r1.45 -r1.46 pkgsrc/devel/gnustep-make/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/gnustep-make/PLIST
diff -r1.15 -r1.16 pkgsrc/devel/gnustep-make/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/devel/gnustep-make/gnustep.mk
cvs diff -r1.45 -r1.46 pkgsrc/devel/gnustep-make/Makefile (switch to unified diff)

--- pkgsrc/devel/gnustep-make/Makefile 2009/04/18 03:10:33 1.45
+++ pkgsrc/devel/gnustep-make/Makefile 2009/04/19 00:50:11 1.46
@@ -1,62 +1,63 @@ @@ -1,62 +1,63 @@
1# $NetBSD: Makefile,v 1.45 2009/04/18 03:10:33 rh Exp $ 1# $NetBSD: Makefile,v 1.46 2009/04/19 00:50:11 rh Exp $
2 2
3DISTNAME= gnustep-make-2.0.8 3DISTNAME= gnustep-make-2.0.8
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel gnustep 5CATEGORIES= devel gnustep
6MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} 6MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
7 7
8MAINTAINER= rh@NetBSD.org 8MAINTAINER= rh@NetBSD.org
9HOMEPAGE= http://www.gnustep.org/ 9HOMEPAGE= http://www.gnustep.org/
10COMMENT= GNUstep makefile package 10COMMENT= GNUstep makefile package
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
15LICENSE= gnu-gpl-v3 15LICENSE= gnu-gpl-v3
16 16
17USE_LANGUAGES= objc 17USE_LANGUAGES= objc
18USE_TOOLS+= csh 18USE_TOOLS+= csh
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q} 20CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
21CONFIGURE_ARGS+= --disable-importing-config-file 21CONFIGURE_ARGS+= --disable-importing-config-file
22CONFIGURE_ARGS+= --with-layout=fhs 22CONFIGURE_ARGS+= --with-layout=fhs
23CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf 23CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
24MAKE_FILE= GNUmakefile 24MAKE_FILE= GNUmakefile
25 25
26CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \ 26CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \
27 ${PKG_SYSCONFDIR}/GNUstep.conf 27 ${PKG_SYSCONFDIR}/GNUstep.conf
28 28
29.include "../../mk/pthread.buildlink3.mk" 29.include "../../mk/pthread.buildlink3.mk"
30 30
31.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") 31.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
32PTHREAD_LIBS+= -lpth 32PTHREAD_LIBS+= -lpth
33.endif 33.endif
34 34
35CONFIGURE_ARGS+= --with-thread-lib=${PTHREAD_LIBS:Q} 35CONFIGURE_ARGS+= --with-thread-lib=${PTHREAD_LIBS:Q}
36 36
37.include "gnustep.mk" 37.include "gnustep.mk"
38 38
39.if ${MACHINE_ARCH} == "i386" 39.if ${MACHINE_ARCH} == "i386"
40GNUSTEP_ARCH= ix86 40GNUSTEP_ARCH= ix86
41.else 41.else
42GNUSTEP_ARCH= ${MACHINE_ARCH} 42GNUSTEP_ARCH= ${MACHINE_ARCH}
43.endif 43.endif
44PLIST_SUBST+= GNUSTEP_ARCH=${GNUSTEP_ARCH} 44PLIST_SUBST+= GNUSTEP_ARCH=${GNUSTEP_ARCH}
45 45
46SUBST_CLASSES+= target 46SUBST_CLASSES+= target
47SUBST_STAGE.target= post-patch 47SUBST_STAGE.target= post-patch
48SUBST_FILES.target= target.make 48SUBST_FILES.target= target.make
49SUBST_SED.target+= -e 's|/usr/pkg|${PREFIX}|g' 49SUBST_SED.target+= -e 's|/usr/pkg|${PREFIX}|g'
50 50
51SUBST_CLASSES+= maninfo 51SUBST_CLASSES+= maninfo
52SUBST_STAGE.maninfo= pre-configure 52SUBST_STAGE.maninfo= pre-configure
53SUBST_MESSAGE.maninfo= Fixing man directory references. 53SUBST_MESSAGE.maninfo= Fixing man directory references.
54SUBST_FILES.maninfo= ${WRKSRC}/FilesystemLayouts/fhs 54SUBST_FILES.maninfo= ${WRKSRC}/FilesystemLayouts/fhs
55SUBST_SED.maninfo= -e 's|share/man|${PKGMANDIR}|' 55SUBST_SED.maninfo= -e 's|share/man|${PKGMANDIR}|'
56SUBST_SED.maninfo+= -e 's|share/info|${PKGINFODIR}|' 56SUBST_SED.maninfo+= -e 's|share/info|${PKGINFODIR}|'
57 57
 58INSTALLATION_DIRS+= share/GNUstep/Library
58INSTALLATION_DIRS+= share/GNUstep/Makefiles/${GNUSTEP_ARCH} 59INSTALLATION_DIRS+= share/GNUstep/Makefiles/${GNUSTEP_ARCH}
59INSTALLATION_DIRS+= share/GNUstep/Makefiles/Additional 60INSTALLATION_DIRS+= share/GNUstep/Makefiles/Additional
60INSTALLATION_DIRS+= share/GNUstep/Makefiles/Auxiliary 61INSTALLATION_DIRS+= share/GNUstep/Makefiles/Auxiliary
61 62
62.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/devel/gnustep-make/PLIST (switch to unified diff)

--- pkgsrc/devel/gnustep-make/PLIST 2009/04/18 01:09:03 1.17
+++ pkgsrc/devel/gnustep-make/PLIST 2009/04/19 00:50:11 1.18
@@ -1,141 +1,143 @@ @@ -1,141 +1,143 @@
1@comment $NetBSD: PLIST,v 1.17 2009/04/18 01:09:03 rh Exp $ 1@comment $NetBSD: PLIST,v 1.18 2009/04/19 00:50:11 rh Exp $
2bin/debugapp 2bin/debugapp
3bin/gnustep-config 3bin/gnustep-config
4bin/openapp 4bin/openapp
5bin/opentool 5bin/opentool
6share/GNUstep/Makefiles/GNUstep-reset.sh 6share/GNUstep/Makefiles/GNUstep-reset.sh
7share/GNUstep/Makefiles/GNUstep.csh 7share/GNUstep/Makefiles/GNUstep.csh
8share/GNUstep/Makefiles/GNUstep.sh 8share/GNUstep/Makefiles/GNUstep.sh
9share/GNUstep/Makefiles/Instance/Documentation/autogsdoc.make 9share/GNUstep/Makefiles/Instance/Documentation/autogsdoc.make
10share/GNUstep/Makefiles/Instance/Documentation/gsdoc.make 10share/GNUstep/Makefiles/Instance/Documentation/gsdoc.make
11share/GNUstep/Makefiles/Instance/Documentation/install_files.make 11share/GNUstep/Makefiles/Instance/Documentation/install_files.make
12share/GNUstep/Makefiles/Instance/Documentation/javadoc.make 12share/GNUstep/Makefiles/Instance/Documentation/javadoc.make
13share/GNUstep/Makefiles/Instance/Documentation/latex.make 13share/GNUstep/Makefiles/Instance/Documentation/latex.make
14share/GNUstep/Makefiles/Instance/Documentation/texi.make 14share/GNUstep/Makefiles/Instance/Documentation/texi.make
15share/GNUstep/Makefiles/Instance/Shared/bundle.make 15share/GNUstep/Makefiles/Instance/Shared/bundle.make
16share/GNUstep/Makefiles/Instance/Shared/headers.make 16share/GNUstep/Makefiles/Instance/Shared/headers.make
17share/GNUstep/Makefiles/Instance/Shared/java.make 17share/GNUstep/Makefiles/Instance/Shared/java.make
18share/GNUstep/Makefiles/Instance/Shared/stamp-string.make 18share/GNUstep/Makefiles/Instance/Shared/stamp-string.make
19share/GNUstep/Makefiles/Instance/Shared/strings.make 19share/GNUstep/Makefiles/Instance/Shared/strings.make
20share/GNUstep/Makefiles/Instance/application.make 20share/GNUstep/Makefiles/Instance/application.make
21share/GNUstep/Makefiles/Instance/bundle.make 21share/GNUstep/Makefiles/Instance/bundle.make
22share/GNUstep/Makefiles/Instance/clibrary.make 22share/GNUstep/Makefiles/Instance/clibrary.make
23share/GNUstep/Makefiles/Instance/ctool.make 23share/GNUstep/Makefiles/Instance/ctool.make
24share/GNUstep/Makefiles/Instance/documentation.make 24share/GNUstep/Makefiles/Instance/documentation.make
25share/GNUstep/Makefiles/Instance/framework.make 25share/GNUstep/Makefiles/Instance/framework.make
26share/GNUstep/Makefiles/Instance/gswapp.make 26share/GNUstep/Makefiles/Instance/gswapp.make
27share/GNUstep/Makefiles/Instance/gswbundle.make 27share/GNUstep/Makefiles/Instance/gswbundle.make
28share/GNUstep/Makefiles/Instance/java-tool.make 28share/GNUstep/Makefiles/Instance/java-tool.make
29share/GNUstep/Makefiles/Instance/java.make 29share/GNUstep/Makefiles/Instance/java.make
30share/GNUstep/Makefiles/Instance/library.make 30share/GNUstep/Makefiles/Instance/library.make
31share/GNUstep/Makefiles/Instance/objc.make 31share/GNUstep/Makefiles/Instance/objc.make
32share/GNUstep/Makefiles/Instance/palette.make 32share/GNUstep/Makefiles/Instance/palette.make
33share/GNUstep/Makefiles/Instance/resource-set.make 33share/GNUstep/Makefiles/Instance/resource-set.make
34share/GNUstep/Makefiles/Instance/rules.make 34share/GNUstep/Makefiles/Instance/rules.make
35share/GNUstep/Makefiles/Instance/service.make 35share/GNUstep/Makefiles/Instance/service.make
36share/GNUstep/Makefiles/Instance/subproject.make 36share/GNUstep/Makefiles/Instance/subproject.make
37share/GNUstep/Makefiles/Instance/test-application.make 37share/GNUstep/Makefiles/Instance/test-application.make
38share/GNUstep/Makefiles/Instance/test-library.make 38share/GNUstep/Makefiles/Instance/test-library.make
39share/GNUstep/Makefiles/Instance/test-tool.make 39share/GNUstep/Makefiles/Instance/test-tool.make
40share/GNUstep/Makefiles/Instance/tool.make 40share/GNUstep/Makefiles/Instance/tool.make
41share/GNUstep/Makefiles/Master/aggregate.make 41share/GNUstep/Makefiles/Master/aggregate.make
42share/GNUstep/Makefiles/Master/application.make 42share/GNUstep/Makefiles/Master/application.make
43share/GNUstep/Makefiles/Master/bundle.make 43share/GNUstep/Makefiles/Master/bundle.make
44share/GNUstep/Makefiles/Master/clibrary.make 44share/GNUstep/Makefiles/Master/clibrary.make
45share/GNUstep/Makefiles/Master/ctool.make 45share/GNUstep/Makefiles/Master/ctool.make
46share/GNUstep/Makefiles/Master/documentation.make 46share/GNUstep/Makefiles/Master/documentation.make
47share/GNUstep/Makefiles/Master/framework.make 47share/GNUstep/Makefiles/Master/framework.make
48share/GNUstep/Makefiles/Master/gswapp.make 48share/GNUstep/Makefiles/Master/gswapp.make
49share/GNUstep/Makefiles/Master/gswbundle.make 49share/GNUstep/Makefiles/Master/gswbundle.make
50share/GNUstep/Makefiles/Master/java-tool.make 50share/GNUstep/Makefiles/Master/java-tool.make
51share/GNUstep/Makefiles/Master/java.make 51share/GNUstep/Makefiles/Master/java.make
52share/GNUstep/Makefiles/Master/library.make 52share/GNUstep/Makefiles/Master/library.make
53share/GNUstep/Makefiles/Master/nsis.make 53share/GNUstep/Makefiles/Master/nsis.make
54share/GNUstep/Makefiles/Master/objc.make 54share/GNUstep/Makefiles/Master/objc.make
55share/GNUstep/Makefiles/Master/palette.make 55share/GNUstep/Makefiles/Master/palette.make
56share/GNUstep/Makefiles/Master/resource-set.make 56share/GNUstep/Makefiles/Master/resource-set.make
57share/GNUstep/Makefiles/Master/rpm.make 57share/GNUstep/Makefiles/Master/rpm.make
58share/GNUstep/Makefiles/Master/rules.make 58share/GNUstep/Makefiles/Master/rules.make
59share/GNUstep/Makefiles/Master/service.make 59share/GNUstep/Makefiles/Master/service.make
60share/GNUstep/Makefiles/Master/source-distribution.make 60share/GNUstep/Makefiles/Master/source-distribution.make
61share/GNUstep/Makefiles/Master/subproject.make 61share/GNUstep/Makefiles/Master/subproject.make
62share/GNUstep/Makefiles/Master/test-application.make 62share/GNUstep/Makefiles/Master/test-application.make
63share/GNUstep/Makefiles/Master/test-library.make 63share/GNUstep/Makefiles/Master/test-library.make
64share/GNUstep/Makefiles/Master/test-tool.make 64share/GNUstep/Makefiles/Master/test-tool.make
65share/GNUstep/Makefiles/Master/tool.make 65share/GNUstep/Makefiles/Master/tool.make
66share/GNUstep/Makefiles/aggregate.make 66share/GNUstep/Makefiles/aggregate.make
67share/GNUstep/Makefiles/app-wrapper.template 67share/GNUstep/Makefiles/app-wrapper.template
68share/GNUstep/Makefiles/application.make 68share/GNUstep/Makefiles/application.make
69share/GNUstep/Makefiles/bundle.make 69share/GNUstep/Makefiles/bundle.make
70share/GNUstep/Makefiles/clean_cpu.sh 70share/GNUstep/Makefiles/clean_cpu.sh
71share/GNUstep/Makefiles/clean_os.sh 71share/GNUstep/Makefiles/clean_os.sh
72share/GNUstep/Makefiles/clean_vendor.sh 72share/GNUstep/Makefiles/clean_vendor.sh
73share/GNUstep/Makefiles/clibrary.make 73share/GNUstep/Makefiles/clibrary.make
74share/GNUstep/Makefiles/common.make 74share/GNUstep/Makefiles/common.make
75share/GNUstep/Makefiles/config-noarch.make 75share/GNUstep/Makefiles/config-noarch.make
76share/GNUstep/Makefiles/config.guess 76share/GNUstep/Makefiles/config.guess
77share/GNUstep/Makefiles/config.make 77share/GNUstep/Makefiles/config.make
78share/GNUstep/Makefiles/config.sub 78share/GNUstep/Makefiles/config.sub
79share/GNUstep/Makefiles/cpu.sh 79share/GNUstep/Makefiles/cpu.sh
80share/GNUstep/Makefiles/ctool.make 80share/GNUstep/Makefiles/ctool.make
81share/GNUstep/Makefiles/documentation.make 81share/GNUstep/Makefiles/documentation.make
82share/GNUstep/Makefiles/empty.make 82share/GNUstep/Makefiles/empty.make
83share/GNUstep/Makefiles/executable.template 83share/GNUstep/Makefiles/executable.template
84share/GNUstep/Makefiles/filesystem.csh 84share/GNUstep/Makefiles/filesystem.csh
85share/GNUstep/Makefiles/filesystem.make 85share/GNUstep/Makefiles/filesystem.make
86share/GNUstep/Makefiles/filesystem.sh 86share/GNUstep/Makefiles/filesystem.sh
87share/GNUstep/Makefiles/fixpath.sh 87share/GNUstep/Makefiles/fixpath.sh
88share/GNUstep/Makefiles/framework.make 88share/GNUstep/Makefiles/framework.make
89share/GNUstep/Makefiles/gnustep-make-help 89share/GNUstep/Makefiles/gnustep-make-help
90share/GNUstep/Makefiles/gswapp.make 90share/GNUstep/Makefiles/gswapp.make
91share/GNUstep/Makefiles/gswbundle.make 91share/GNUstep/Makefiles/gswbundle.make
92share/GNUstep/Makefiles/install-sh 92share/GNUstep/Makefiles/install-sh
93share/GNUstep/Makefiles/java-executable.template 93share/GNUstep/Makefiles/java-executable.template
94share/GNUstep/Makefiles/java-tool.make 94share/GNUstep/Makefiles/java-tool.make
95share/GNUstep/Makefiles/java.make 95share/GNUstep/Makefiles/java.make
96share/GNUstep/Makefiles/jni.make 96share/GNUstep/Makefiles/jni.make
97share/GNUstep/Makefiles/library-combo.make 97share/GNUstep/Makefiles/library-combo.make
98share/GNUstep/Makefiles/library.make 98share/GNUstep/Makefiles/library.make
99share/GNUstep/Makefiles/messages.make 99share/GNUstep/Makefiles/messages.make
100share/GNUstep/Makefiles/mkinstalldirs 100share/GNUstep/Makefiles/mkinstalldirs
101share/GNUstep/Makefiles/names.make 101share/GNUstep/Makefiles/names.make
102share/GNUstep/Makefiles/native-library.make 102share/GNUstep/Makefiles/native-library.make
103share/GNUstep/Makefiles/nsi-app.template 103share/GNUstep/Makefiles/nsi-app.template
104share/GNUstep/Makefiles/objc.make 104share/GNUstep/Makefiles/objc.make
105share/GNUstep/Makefiles/os.sh 105share/GNUstep/Makefiles/os.sh
106share/GNUstep/Makefiles/palette.make 106share/GNUstep/Makefiles/palette.make
107share/GNUstep/Makefiles/print_unique_pathlist.sh 107share/GNUstep/Makefiles/print_unique_pathlist.sh
108share/GNUstep/Makefiles/relative_path.sh 108share/GNUstep/Makefiles/relative_path.sh
109share/GNUstep/Makefiles/resource-set.make 109share/GNUstep/Makefiles/resource-set.make
110share/GNUstep/Makefiles/rules.make 110share/GNUstep/Makefiles/rules.make
111share/GNUstep/Makefiles/service.make 111share/GNUstep/Makefiles/service.make
112share/GNUstep/Makefiles/spec-rules.template 112share/GNUstep/Makefiles/spec-rules.template
113share/GNUstep/Makefiles/strip_makefiles.sh 113share/GNUstep/Makefiles/strip_makefiles.sh
114share/GNUstep/Makefiles/subproject.make 114share/GNUstep/Makefiles/subproject.make
115share/GNUstep/Makefiles/tar-exclude-list 115share/GNUstep/Makefiles/tar-exclude-list
116share/GNUstep/Makefiles/target.make 116share/GNUstep/Makefiles/target.make
117share/GNUstep/Makefiles/test-application.make 117share/GNUstep/Makefiles/test-application.make
118share/GNUstep/Makefiles/test-library.make 118share/GNUstep/Makefiles/test-library.make
119share/GNUstep/Makefiles/test-tool.make 119share/GNUstep/Makefiles/test-tool.make
120share/GNUstep/Makefiles/tool.make 120share/GNUstep/Makefiles/tool.make
121share/GNUstep/Makefiles/vendor.sh 121share/GNUstep/Makefiles/vendor.sh
122share/examples/GNUstep/GNUstep.conf 122share/examples/GNUstep/GNUstep.conf
123man/man1/debugapp.1 123man/man1/debugapp.1
124man/man1/gnustep-config.1 124man/man1/gnustep-config.1
125man/man1/openapp.1 125man/man1/openapp.1
126man/man1/opentool.1 126man/man1/opentool.1
127man/man7/GNUstep.7 127man/man7/GNUstep.7
128man/man7/library-combo.7 128man/man7/library-combo.7
129@dirrm share/examples/GNUstep 129@dirrm share/examples/GNUstep
130@exec ${MKDIR} %D/share/GNUstep/Makefiles/${GNUSTEP_ARCH} 130@exec ${MKDIR} %D/share/GNUstep/Makefiles/${GNUSTEP_ARCH}
131@dirrm share/GNUstep/Makefiles/${GNUSTEP_ARCH} 131@dirrm share/GNUstep/Makefiles/${GNUSTEP_ARCH}
132@dirrm share/GNUstep/Makefiles/Master 132@dirrm share/GNUstep/Makefiles/Master
133@dirrm share/GNUstep/Makefiles/Instance/Shared 133@dirrm share/GNUstep/Makefiles/Instance/Shared
134@dirrm share/GNUstep/Makefiles/Instance/Documentation 134@dirrm share/GNUstep/Makefiles/Instance/Documentation
135@dirrm share/GNUstep/Makefiles/Instance 135@dirrm share/GNUstep/Makefiles/Instance
136@exec ${MKDIR} %D/share/GNUstep/Makefiles/Auxiliary 136@exec ${MKDIR} %D/share/GNUstep/Makefiles/Auxiliary
137@dirrm share/GNUstep/Makefiles/Auxiliary 137@dirrm share/GNUstep/Makefiles/Auxiliary
138@exec ${MKDIR} %D/share/GNUstep/Makefiles/Additional 138@exec ${MKDIR} %D/share/GNUstep/Makefiles/Additional
139@unexec ${RMDIR} %D/share/GNUstep/Makefiles/Additional 2>/dev/null || ${TRUE} 139@dirrm share/GNUstep/Makefiles/Additional
140@dirrm share/GNUstep/Makefiles 140@dirrm share/GNUstep/Makefiles
141@unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE} 141@unexec ${RMDIR} %D/share/GNUstep 2>/dev/null || ${TRUE}
 142@dirrm share/GNUstep/Library
 143@exec ${MKDIR} %D/share/GNUstep/Library
cvs diff -r1.15 -r1.16 pkgsrc/devel/gnustep-make/buildlink3.mk (switch to unified diff)

--- pkgsrc/devel/gnustep-make/buildlink3.mk 2009/04/18 03:10:33 1.15
+++ pkgsrc/devel/gnustep-make/buildlink3.mk 2009/04/19 00:50:11 1.16
@@ -1,40 +1,42 @@ @@ -1,40 +1,42 @@
1# $NetBSD: buildlink3.mk,v 1.15 2009/04/18 03:10:33 rh Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2009/04/19 00:50:11 rh Exp $
2 2
3BUILDLINK_TREE+= gnustep-make 3BUILDLINK_TREE+= gnustep-make
4 4
5.if !defined(GNUSTEP_MAKE_BUILDLINK3_MK) 5.if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
6GNUSTEP_MAKE_BUILDLINK3_MK:= 6GNUSTEP_MAKE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=2.0.8nb1 8BUILDLINK_API_DEPENDS.gnustep-make+= gnustep-make>=2.0.8nb2
9BUILDLINK_ABI_DEPENDS.gnustep-make?= gnustep-make>=2.0.8nb1 9BUILDLINK_ABI_DEPENDS.gnustep-make?= gnustep-make>=2.0.8nb2
10BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make 10BUILDLINK_PKGSRCDIR.gnustep-make?= ../../devel/gnustep-make
11 11
12.include "../../devel/gnustep-make/gnustep.mk" 12.include "../../devel/gnustep-make/gnustep.mk"
13 13
14BUILDLINK_LIBDIRS.gnustep-make= lib ${GNUSTEP_BLDIRS} 14BUILDLINK_LIBDIRS.gnustep-make= lib ${GNUSTEP_BLDIRS}
15BUILDLINK_INCDIRS.gnustep-make= include ${GNUSTEP_BIDIRS} 15BUILDLINK_INCDIRS.gnustep-make= include ${GNUSTEP_BIDIRS}
16 16
17PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 17PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
 18PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Library$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
18PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 19PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
19PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 20PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
20PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Additional$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 21PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Additional$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
21PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Auxiliary$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 22PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Auxiliary$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
22PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 23PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
23PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 24PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
24PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 25PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
25PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Master$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 26PRINT_PLIST_AWK+= /^@dirrm share\/GNUstep\/Makefiles\/Master$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
26PRINT_PLIST_AWK+= /^@dirrm share\/examples\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; } 27PRINT_PLIST_AWK+= /^@dirrm share\/examples\/GNUstep$$/ { print "@comment in devel/gnustep-make: " $$0; next; }
27PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep$$/ { next; } 28PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep$$/ { next; }
 29PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Library$$/ { next; }
28PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles$$/ { next; } 30PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles$$/ { next; }
29PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { next; } 31PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/${GNUSTEP_ARCH}$$/ { next; }
30PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Additional$$/ { next; } 32PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Additional$$/ { next; }
31PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Auxiliary$$/ { next; } 33PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Auxiliary$$/ { next; }
32PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance$$/ { next; } 34PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance$$/ { next; }
33PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { next; } 35PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Documentation$$/ { next; }
34PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { next; } 36PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Instance\/Shared$$/ { next; }
35PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Master$$/ { next; } 37PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/Makefiles\/Master$$/ { next; }
36PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/examples\/GNUstep$$/ { next; } 38PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/examples\/GNUstep$$/ { next; }
37 39
38.endif # GNUSTEP_MAKE_BUILDLINK3_MK 40.endif # GNUSTEP_MAKE_BUILDLINK3_MK
39 41
40BUILDLINK_TREE+= -gnustep-make 42BUILDLINK_TREE+= -gnustep-make
cvs diff -r1.14 -r1.15 pkgsrc/devel/gnustep-make/gnustep.mk (switch to unified diff)

--- pkgsrc/devel/gnustep-make/gnustep.mk 2009/04/19 00:09:49 1.14
+++ pkgsrc/devel/gnustep-make/gnustep.mk 2009/04/19 00:50:11 1.15
@@ -1,147 +1,148 @@ @@ -1,147 +1,148 @@
1# $NetBSD: gnustep.mk,v 1.14 2009/04/19 00:09:49 rh Exp $ 1# $NetBSD: gnustep.mk,v 1.15 2009/04/19 00:50:11 rh Exp $
2 2
3.if !defined(GNUSTEP_MK) 3.if !defined(GNUSTEP_MK)
4GNUSTEP_MK= #defined 4GNUSTEP_MK= #defined
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7 7
8GNUSTEP_SUBDIR= share/GNUstep 8GNUSTEP_SUBDIR= share/GNUstep
9GNUSTEP_ROOT= ${PREFIX} 9GNUSTEP_ROOT= ${PREFIX}
10GNUSTEP_LIB_DIR= ${GNUSTEP_ROOT}/lib/GNUstep 10GNUSTEP_LIB_DIR= ${GNUSTEP_ROOT}/lib/GNUstep
11GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System 11GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_ROOT}/System
12GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local 12GNUSTEP_LOCAL_ROOT= ${GNUSTEP_ROOT}/Local
13GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network 13GNUSTEP_NETWORK_ROOT= ${GNUSTEP_ROOT}/Network
14GNUSTEP_MAKEFILES= ${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Makefiles 14GNUSTEP_MAKEFILES= ${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Makefiles
15GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM} 15GNUSTEP_HOST= ${MACHINE_GNU_PLATFORM}
16GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/} 16GNUSTEP_HOST_CPU= ${MACHINE_GNU_ARCH:S/i386/ix86/}
17GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR} 17GNUSTEP_HOST_VENDOR= ${LOWER_VENDOR}
18GNUSTEP_HOST_OS= ${LOWER_OPSYS} 18GNUSTEP_HOST_OS= ${LOWER_OPSYS}
19 19
20GNUSTEP_FLATTENED= yes 20GNUSTEP_FLATTENED= yes
21GNUSTEP_IS_FLATTENED= yes 21GNUSTEP_IS_FLATTENED= yes
22 22
23GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep 23GNUSTEP_USER_ROOT= ${BUILDLINK_DIR}/share/GNUstep
24GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT} 24GNUSTEP_PATHLIST= ${GNUSTEP_USER_ROOT}
25GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS} 25GNUSTEP_PATH= ${GNUSTEP_USER_ROOT}/Tools:${GNUSTEP_USER_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
26GUILE_LOAD_PATH= ${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_USER_ROOT}/lib 26GUILE_LOAD_PATH= ${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_USER_ROOT}/lib
27GNUSTEP_LDIR= lib 27GNUSTEP_LDIR= lib
28GNUSTEP_IDIR= include 28GNUSTEP_IDIR= include
29GNUSTEP_LFLAGS= ${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_USER_ROOT:S/^/-L/}/${GNUSTEP_LDIR} 29GNUSTEP_LFLAGS= ${GNUSTEP_ROOT:S/^/-L/}/${GNUSTEP_LDIR} ${GNUSTEP_USER_ROOT:S/^/-L/}/${GNUSTEP_LDIR}
30GNUSTEP_IFLAGS= ${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_USER_ROOT:S/^/-I/}/${GNUSTEP_IDIR} 30GNUSTEP_IFLAGS= ${GNUSTEP_ROOT:S/^/-I/}/${GNUSTEP_IDIR} ${GNUSTEP_USER_ROOT:S/^/-I/}/${GNUSTEP_IDIR}
31GNUSTEP_LDIRS= ${GNUSTEP_LFLAGS:S/-L//g} 31GNUSTEP_LDIRS= ${GNUSTEP_LFLAGS:S/-L//g}
32GNUSTEP_IDIRS= ${GNUSTEP_IFLAGS:S/-I//g} 32GNUSTEP_IDIRS= ${GNUSTEP_IFLAGS:S/-I//g}
33GNUSTEP_BLDIRS= ${GNUSTEP_LDIRS:S/${PREFIX}\///g} 33GNUSTEP_BLDIRS= ${GNUSTEP_LDIRS:S/${PREFIX}\///g}
34GNUSTEP_BIDIRS= ${GNUSTEP_IDIRS:S/${PREFIX}\///g} 34GNUSTEP_BIDIRS= ${GNUSTEP_IDIRS:S/${PREFIX}\///g}
35.if !empty(_USE_RPATH:M[yY][eE][sS]) 35.if !empty(_USE_RPATH:M[yY][eE][sS])
36GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/${COMPILER_RPATH_FLAG}/g} 36GNUSTEP_RFLAGS= ${GNUSTEP_LFLAGS:S/-L/${COMPILER_RPATH_FLAG}/g}
37.else 37.else
38GNUSTEP_RFLAGS?= 38GNUSTEP_RFLAGS?=
39.endif 39.endif
40GNUSTEP_LDFLAGS= ${GNUSTEP_LFLAGS} ${GNUSTEP_RFLAGS} 40GNUSTEP_LDFLAGS= ${GNUSTEP_LFLAGS} ${GNUSTEP_RFLAGS}
41 41
42.if defined(FIX_GNUSTEP_INSTALLATION_DIR) 42.if defined(FIX_GNUSTEP_INSTALLATION_DIR)
43SUBST_CLASSES+= gnustep_installation_dir 43SUBST_CLASSES+= gnustep_installation_dir
44SUBST_STAGE.gnustep_installation_dir= post-patch 44SUBST_STAGE.gnustep_installation_dir= post-patch
45SUBST_FILES.gnustep_installation_dir?= GNUmakefile 45SUBST_FILES.gnustep_installation_dir?= GNUmakefile
46SUBST_SED.gnustep_installation_dir+= -e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|' 46SUBST_SED.gnustep_installation_dir+= -e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|'
47SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME}|g' 47SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME}|g'
 48SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Library|$${DESTDIR}${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Library|g'
48SUBST_SED.gnustep_installation_dir+= -e 's|INSTALL_ROOT_DIR|DESTDIR|g' 49SUBST_SED.gnustep_installation_dir+= -e 's|INSTALL_ROOT_DIR|DESTDIR|g'
49.endif 50.endif
50 51
51GNUSTEP_FAKE_PRIVILEGED_BUILD?= YES 52GNUSTEP_FAKE_PRIVILEGED_BUILD?= YES
52 53
53.if !empty(GNUSTEP_FAKE_PRIVILEGED_BUILD:M[yY][eE][sS]) 54.if !empty(GNUSTEP_FAKE_PRIVILEGED_BUILD:M[yY][eE][sS])
54post-wrapper: create-gnustep-chown-links 55post-wrapper: create-gnustep-chown-links
55 56
56create-gnustep-chown-links: 57create-gnustep-chown-links:
57 ${RUN}${ECHO} > ${BUILDLINK_BINDIR}/chown '#!${SH:Q}' 58 ${RUN}${ECHO} > ${BUILDLINK_BINDIR}/chown '#!${SH:Q}'
58 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chown '${CHOWN:Q} "$$@" 2>/dev/null || \' 59 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chown '${CHOWN:Q} "$$@" 2>/dev/null || \'
59 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chown '${TRUE}' 60 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chown '${TRUE}'
60 ${RUN}${ECHO} > ${BUILDLINK_BINDIR}/chgrp '#!${SH:Q}' 61 ${RUN}${ECHO} > ${BUILDLINK_BINDIR}/chgrp '#!${SH:Q}'
61 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chgrp '${CHGRP:Q} "$$@" 2>/dev/null || \' 62 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chgrp '${CHGRP:Q} "$$@" 2>/dev/null || \'
62 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chgrp '${TRUE}' 63 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/chgrp '${TRUE}'
63 ${RUN}${ECHO} > ${BUILDLINK_BINDIR}/install '#!${SH:Q}' 64 ${RUN}${ECHO} > ${BUILDLINK_BINDIR}/install '#!${SH:Q}'
64 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/install '${INSTALL:Q} "$$@" 2>/dev/null || \' 65 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/install '${INSTALL:Q} "$$@" 2>/dev/null || \'
65 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/install '${INSTALL:Q} `${ECHO} "$$@" | \ 66 ${RUN}${ECHO} >> ${BUILDLINK_BINDIR}/install '${INSTALL:Q} `${ECHO} "$$@" | \
66 ${SED} -e "s/-[og][ ]*[^ ]*//g"`' 67 ${SED} -e "s/-[og][ ]*[^ ]*//g"`'
67 ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/chown 68 ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/chown
68 ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/chgrp 69 ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/chgrp
69 ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/install 70 ${RUN}${CHMOD} +x ${BUILDLINK_BINDIR}/install
70 71
71GNUSTEP_INSTALL= ${BUILDLINK_BINDIR}/install 72GNUSTEP_INSTALL= ${BUILDLINK_BINDIR}/install
72GNUSTEP_INSTALL_DATA= ${INSTALL_DATA:S/${INSTALL}/${GNUSTEP_INSTALL}/} 73GNUSTEP_INSTALL_DATA= ${INSTALL_DATA:S/${INSTALL}/${GNUSTEP_INSTALL}/}
73GNUSTEP_INSTALL_PROGRAM=${INSTALL_PROGRAM:S/${INSTALL}/${GNUSTEP_INSTALL}/} 74GNUSTEP_INSTALL_PROGRAM=${INSTALL_PROGRAM:S/${INSTALL}/${GNUSTEP_INSTALL}/}
74.else 75.else
75GNUSTEP_INSTALL= ${INSTALL} 76GNUSTEP_INSTALL= ${INSTALL}
76GNUSTEP_INSTALL_DATA= ${INSTALL_DATA} 77GNUSTEP_INSTALL_DATA= ${INSTALL_DATA}
77GNUSTEP_INSTALL_PROGRAM=${INSTALL_PROGRAM} 78GNUSTEP_INSTALL_PROGRAM=${INSTALL_PROGRAM}
78.endif 79.endif
79 80
80GNUSTEP_OVERRIDE_INSTALL?= YES 81GNUSTEP_OVERRIDE_INSTALL?= YES
81 82
82.if !empty(GNUSTEP_OVERRIDE_INSTALL:M[yY][eE][sS]) 83.if !empty(GNUSTEP_OVERRIDE_INSTALL:M[yY][eE][sS])
83MAKE_ENV+= INSTALL=${GNUSTEP_INSTALL:Q} 84MAKE_ENV+= INSTALL=${GNUSTEP_INSTALL:Q}
84MAKE_ENV+= INSTALL_DATA=${GNUSTEP_INSTALL_DATA:Q} 85MAKE_ENV+= INSTALL_DATA=${GNUSTEP_INSTALL_DATA:Q}
85MAKE_ENV+= INSTALL_PROGRAM=${GNUSTEP_INSTALL_PROGRAM:Q} 86MAKE_ENV+= INSTALL_PROGRAM=${GNUSTEP_INSTALL_PROGRAM:Q}
86.endif 87.endif
87 88
88.if !defined(NO_GNUSTEP_ENV) 89.if !defined(NO_GNUSTEP_ENV)
89 90
90PATH:= ${GNUSTEP_PATH}:${PATH} 91PATH:= ${GNUSTEP_PATH}:${PATH}
91 92
92LDFLAGS+= ${GNUSTEP_LDFLAGS} 93LDFLAGS+= ${GNUSTEP_LDFLAGS}
93CPPFLAGS+= ${GNUSTEP_IFLAGS} 94CPPFLAGS+= ${GNUSTEP_IFLAGS}
94CFLAGS+= ${GNUSTEP_IFLAGS} 95CFLAGS+= ${GNUSTEP_IFLAGS}
95 96
96USE_TOOLS+= gmake 97USE_TOOLS+= gmake
97. if defined(GNUSTEP_MAKEFILE) 98. if defined(GNUSTEP_MAKEFILE)
98MAKE_FILE= ${GNUSTEP_MAKEFILE} 99MAKE_FILE= ${GNUSTEP_MAKEFILE}
99. else 100. else
100MAKE_FILE= GNUmakefile 101MAKE_FILE= GNUmakefile
101. endif 102. endif
102 103
103. if !defined(NO_CONFIGURE) && !defined(HAS_CONFIGURE) 104. if !defined(NO_CONFIGURE) && !defined(HAS_CONFIGURE)
104GNU_CONFIGURE= yes 105GNU_CONFIGURE= yes
105. endif 106. endif
106 107
107MAKE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q} 108MAKE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
108MAKE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q} 109MAKE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q}
109MAKE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q} 110MAKE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q}
110MAKE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} 111MAKE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
111MAKE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q} 112MAKE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
112MAKE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q} 113MAKE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
113MAKE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q} 114MAKE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
114MAKE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q} 115MAKE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
115MAKE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q} 116MAKE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
116MAKE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q} 117MAKE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
117 118
118. if defined(GNUSTEP_OBSOLETE_ENV) 119. if defined(GNUSTEP_OBSOLETE_ENV)
119MAKE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q} 120MAKE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
120MAKE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q} 121MAKE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
121MAKE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q} 122MAKE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
122MAKE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q} 123MAKE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
123. endif # GNUSTEP_OBSOLETE_ENV 124. endif # GNUSTEP_OBSOLETE_ENV
124 125
125. if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE) 126. if defined(GNU_CONFIGURE) || defined(HAS_CONFIGURE)
126GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT} 127GNU_CONFIGURE_PREFIX?= ${GNUSTEP_ROOT}
127CONFIGURE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q} 128CONFIGURE_ENV+= GNUSTEP_ROOT=${GNUSTEP_ROOT:Q}
128CONFIGURE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q} 129CONFIGURE_ENV+= GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES:Q}
129CONFIGURE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q} 130CONFIGURE_ENV+= GNUSTEP_HOST=${GNUSTEP_HOST:Q}
130CONFIGURE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q} 131CONFIGURE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
131CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q} 132CONFIGURE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
132CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q} 133CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
133CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q} 134CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
134CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q} 135CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
135CONFIGURE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q} 136CONFIGURE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
136CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q} 137CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
137 138
138. if defined(GNUSTEP_OBSOLETE_ENV) 139. if defined(GNUSTEP_OBSOLETE_ENV)
139CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q} 140CONFIGURE_ENV+= GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT:Q}
140CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q} 141CONFIGURE_ENV+= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT:Q}
141CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q} 142CONFIGURE_ENV+= GNUSTEP_NETWORK_ROOT=${GNUSTEP_NETWORK_ROOT:Q}
142CONFIGURE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q} 143CONFIGURE_ENV+= GUILE_LOAD_PATH=${GUILE_LOAD_PATH:Q}
143. endif # GNUSTEP_OBSOLETE_ENV 144. endif # GNUSTEP_OBSOLETE_ENV
144. endif # GNU_CONFIGURE 145. endif # GNU_CONFIGURE
145.endif # !NO_GNUSTEP_ENV 146.endif # !NO_GNUSTEP_ENV
146 147
147.endif # !defined(GNUSTEP_MK) 148.endif # !defined(GNUSTEP_MK)