[Gsrc-commit] /srv/bzr/gsrc/trunk r1399: change default install directory of GNUstep stuff

[Brandon Invergo]

------------------------------------------------------------
revno: 1399
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-11 23:54:35 +0100
message:
  change default install directory of GNUstep stuff
modified:
  gar.lib/gnustep.mk
  gnustep/gnustep-base/Makefile
  gnustep/gnustep-make/Makefile

=== modified file 'gar.lib/gnustep.mk'
--- a/gar.lib/gnustep.mk        2012-12-11 08:44:23 +0000
+++ b/gar.lib/gnustep.mk        2012-12-11 22:54:35 +0000
@@ -9,7 +9,7 @@
 
 include ../../gar.lib/auto.mk
 
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
+GS_SETUP = . /$(prefix)/System/Library/Makefiles/GNUstep.sh
 CONFIGURE_ENV += $(GS_SETUP) &&
 BUILD_ENV += $(GS_SETUP) &&
 INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/gnustep-base/Makefile'
--- a/gnustep/gnustep-base/Makefile     2012-12-11 08:44:23 +0000
+++ b/gnustep/gnustep-base/Makefile     2012-12-11 22:54:35 +0000
@@ -11,8 +11,8 @@
 SIGFILES = $(DISTNAME).tar.gz.sig
 PATCHFILES = $(DISTNAME)-conf-ignore-xmltest.diff
 
-BUILDDEPS = gnustep-make
-LIBDEPS = libffi libxml2
+BUILDDEPS = 
+LIBDEPS = gnustep-make libffi libxml2
 
 ######################################################################
 
@@ -21,7 +21,7 @@
 include ../../gar.lib/gnustep.mk
 include config.mk
 
-CONFIGURE_ARGS += 
--with-default-config=$(prefix)/GNUstep/Local/Configuration/GNUstep.conf \
+CONFIGURE_ARGS += --with-default-config=$(prefix)/etc/GNUstep/GNUstep.conf \
                  --with-ffi-include=$(prefix)/lib/libffi-3.0.11/include/ \
                  --with-ffi-library=$(prefix)/lib \
                  --with-xml-prefix=$(prefix)

=== modified file 'gnustep/gnustep-make/Makefile'
--- a/gnustep/gnustep-make/Makefile     2012-12-10 22:51:18 +0000
+++ b/gnustep/gnustep-make/Makefile     2012-12-11 22:54:35 +0000
@@ -18,5 +18,5 @@
 include ../../gar.lib/auto.mk
 include config.mk
 
-CONFIGURE_ARGS += --prefix=$(prefix)/GNUstep \
-                 
--with-config-file=$(prefix)/GNUstep/Local/Configuration/GNUstep.conf
+
+