? autom4te.cache
? fhs.patch
? Documentation/ANNOUNCE
? Documentation/FAQ
Index: GNUmakefile.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/GNUmakefile.in,v
retrieving revision 1.118
diff -u -r1.118 GNUmakefile.in
--- GNUmakefile.in	13 Oct 2003 18:34:36 -0000	1.118
+++ GNUmakefile.in	15 Oct 2003 03:11:22 -0000
@@ -61,7 +61,7 @@
 export MAYBE_LIBRARY_COMBO
 
 makedir = $(GNUSTEP_SYSTEM_ROOT)/@MAKEFILES_SUFFIX@
-tooldir = $(GNUSTEP_SYSTEM_ROOT)/Tools
+tooldir = $(GNUSTEP_SYSTEM_ROOT)/bin
 
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM	= @INSTALL_PROGRAM@
Index: GNUstep.sh.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/GNUstep.sh.in,v
retrieving revision 1.81
diff -u -r1.81 GNUstep.sh.in
--- GNUstep.sh.in	28 Apr 2003 02:25:33 -0000	1.81
+++ GNUstep.sh.in	15 Oct 2003 03:11:22 -0000
@@ -213,17 +213,17 @@
 IFS="$tmp_IFS"
 unset tmp_IFS
 unset dir
-if [ -z "$PATH" ]; then
-  PATH="$temp_path"
-else
-  if ( echo ${PATH}| grep -v "${temp_path}" >/dev/null ); then
-    PATH="${temp_path}:${PATH}"
-  fi
-fi
+#if [ -z "$PATH" ]; then
+#  PATH="$temp_path"
+#else
+#  if ( echo ${PATH}| grep -v "${temp_path}" >/dev/null ); then
+#    PATH="${temp_path}:${PATH}"
+#  fi
+#fi
 unset temp_path
-export PATH
+#export PATH
 
-. $GNUSTEP_MAKEFILES/ld_lib_path.sh
+#. $GNUSTEP_MAKEFILES/ld_lib_path.sh
 
 tmp_IFS="$IFS"
 IFS=:
Index: common.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/common.make,v
retrieving revision 1.136
diff -u -r1.136 common.make
--- common.make	15 Oct 2003 02:52:56 -0000	1.136
+++ common.make	15 Oct 2003 03:11:22 -0000
@@ -65,7 +65,7 @@
 
 # Take the makefiles from the system root
 ifeq ($(GNUSTEP_MAKEFILES),)
-  GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Library/Makefiles
+  GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/share/GNUstep/Makefiles
 endif
 
 #
@@ -192,23 +192,23 @@
 #
 # Variables specifying the installation directory paths
 #
-GNUSTEP_APPS                 = $(GNUSTEP_INSTALLATION_DIR)/Applications
-GNUSTEP_TOOLS                = $(GNUSTEP_INSTALLATION_DIR)/Tools
-GNUSTEP_LIBRARY              = $(GNUSTEP_INSTALLATION_DIR)/Library
+GNUSTEP_APPS                 = $(GNUSTEP_INSTALLATION_DIR)/lib/GNUstep
+GNUSTEP_TOOLS                = $(GNUSTEP_INSTALLATION_DIR)/bin
+GNUSTEP_LIBRARY              = $(GNUSTEP_INSTALLATION_DIR)/share
 GNUSTEP_SERVICES             = $(GNUSTEP_LIBRARY)/Services
 ifeq ($(GNUSTEP_FLATTENED),yes)
-  GNUSTEP_HEADERS              = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
+  GNUSTEP_HEADERS              = $(GNUSTEP_INSTALLATION_DIR)/include/GNUstep
 else
-  GNUSTEP_HEADERS              = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/$(LIBRARY_COMBO)
+  GNUSTEP_HEADERS              = $(GNUSTEP_INSTALLATION_DIR)/include/GNUstep/$(LIBRARY_COMBO)
 endif
 GNUSTEP_APPLICATION_SUPPORT  = $(GNUSTEP_LIBRARY)/ApplicationSupport
 GNUSTEP_BUNDLES 	     = $(GNUSTEP_LIBRARY)/Bundles
 GNUSTEP_FRAMEWORKS	     = $(GNUSTEP_LIBRARY)/Frameworks
 GNUSTEP_PALETTES 	     = $(GNUSTEP_LIBRARY)/ApplicationSupport/Palettes
-GNUSTEP_LIBRARIES            = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
+GNUSTEP_LIBRARIES            = $(GNUSTEP_INSTALLATION_DIR)/lib
 GNUSTEP_RESOURCES            = $(GNUSTEP_LIBRARY)/Libraries/Resources
 GNUSTEP_JAVA                 = $(GNUSTEP_LIBRARY)/Libraries/Java
-GNUSTEP_DOCUMENTATION        = $(GNUSTEP_LIBRARY)/Documentation
+GNUSTEP_DOCUMENTATION        = $(GNUSTEP_LIBRARY)/share/doc/GNUstep
 GNUSTEP_DOCUMENTATION_MAN    = $(GNUSTEP_DOCUMENTATION)/man
 GNUSTEP_DOCUMENTATION_INFO   = $(GNUSTEP_DOCUMENTATION)/info
 
@@ -223,38 +223,38 @@
 ifeq ($(GNUSTEP_FLATTENED),)
 
 GNUSTEP_HEADERS_DIRS = \
-  $(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR) \
-  $(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
-  $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
-  $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)
+  $(GNUSTEP_USER_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR) \
+  $(GNUSTEP_USER_ROOT)/include/GNUstep/$(LIBRARY_COMBO) \
+  $(GNUSTEP_LOCAL_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
+  $(GNUSTEP_LOCAL_ROOT)/include/GNUstep/$(LIBRARY_COMBO) \
+  $(GNUSTEP_NETWORK_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
+  $(GNUSTEP_NETWORK_ROOT)/include/GNUstep/$(LIBRARY_COMBO) \
+  $(GNUSTEP_SYSTEM_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
+  $(GNUSTEP_SYSTEM_ROOT)/include/GNUstep/$(LIBRARY_COMBO)
 
 GNUSTEP_LIBRARIES_DIRS = \
-  $(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
-  $(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR) \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR) \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR) \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_DIR)
+  $(GNUSTEP_USER_ROOT)/lib/$(GNUSTEP_TARGET_LDIR) \
+  $(GNUSTEP_USER_ROOT)/lib/$(GNUSTEP_TARGET_DIR) \
+  $(GNUSTEP_LOCAL_ROOT)/lib/$(GNUSTEP_TARGET_LDIR) \
+  $(GNUSTEP_LOCAL_ROOT)/lib/$(GNUSTEP_TARGET_DIR) \
+  $(GNUSTEP_NETWORK_ROOT)/lib/$(GNUSTEP_TARGET_LDIR) \
+  $(GNUSTEP_NETWORK_ROOT)/lib/$(GNUSTEP_TARGET_DIR) \
+  $(GNUSTEP_SYSTEM_ROOT)/lib/$(GNUSTEP_TARGET_LDIR) \
+  $(GNUSTEP_SYSTEM_ROOT)/lib/$(GNUSTEP_TARGET_DIR)
 
 else # GNUSTEP_FLATTENED
 
 GNUSTEP_HEADERS_DIRS = \
-  $(GNUSTEP_USER_ROOT)/Library/Headers \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Headers \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Headers \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
+  $(GNUSTEP_USER_ROOT)/include/GNUstep \
+  $(GNUSTEP_LOCAL_ROOT)/include/GNUstep \
+  $(GNUSTEP_NETWORK_ROOT)/include/GNUstep \
+  $(GNUSTEP_SYSTEM_ROOT)/include/GNUstep
 
 GNUSTEP_LIBRARIES_DIRS = \
-  $(GNUSTEP_USER_ROOT)/Library/Libraries \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Libraries \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Libraries \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
+  $(GNUSTEP_USER_ROOT)/lib \
+  $(GNUSTEP_LOCAL_ROOT)/lib \
+  $(GNUSTEP_NETWORK_ROOT)/lib \
+  $(GNUSTEP_SYSTEM_ROOT)/lib
 
 endif # GNUSTEP_FLATTENED
 
@@ -300,16 +300,16 @@
 # in.
 ifeq ($(GNUSTEP_FLATTENED),yes)
 GNUSTEP_HEADERS_FND_DIRS = \
-  $(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)
+  $(GNUSTEP_USER_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR) \
+  $(GNUSTEP_LOCAL_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR) \
+  $(GNUSTEP_NETWORK_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR) \
+  $(GNUSTEP_SYSTEM_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR)
 else
 GNUSTEP_HEADERS_FND_DIRS = \
-  $(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
-  $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
-  $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
-  $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR)
+  $(GNUSTEP_USER_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
+  $(GNUSTEP_LOCAL_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
+  $(GNUSTEP_NETWORK_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
+  $(GNUSTEP_SYSTEM_ROOT)/include/GNUstep/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR)
 endif
 
 ifeq ($(FOUNDATION_LIB), fd)
@@ -335,11 +335,11 @@
   OBJC_RUNTIME = GNU
 endif
   GNUSTEP_HEADERS_FND_DIRS += \
-    $(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \
-    $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \
-    $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \
-    $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
+    $(GNUSTEP_USER_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \
+    $(GNUSTEP_LOCAL_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \
+    $(GNUSTEP_NETWORK_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME) \
+    $(GNUSTEP_SYSTEM_ROOT)/include/GNUstep/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
 endif
 
 ifeq ($(REMOVE_EMPTY_DIRS), yes)
Index: configure.ac
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/configure.ac,v
retrieving revision 1.24
diff -u -r1.24 configure.ac
--- configure.ac	13 Oct 2003 18:33:02 -0000	1.24
+++ configure.ac	15 Oct 2003 03:11:25 -0000
@@ -185,7 +185,7 @@
 # Makefiles dir in the previous location, reset this variable to
 # 'Makefiles' and regenerate configure. Note this doesn't change all
 # occurances.
-MAKEFILES_SUFFIX=Library/Makefiles
+MAKEFILES_SUFFIX=share/GNUstep/Makefiles
 AC_SUBST(MAKEFILES_SUFFIX)
 
 # HOST_INSTALL is the name of the install program in config.make so set it up
@@ -210,7 +210,7 @@
 --with-local-root=/usr/local/GNUstep/Local
 ],
 GNUSTEP_LOCAL_ROOT="$withval",
-GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/Local"
+GNUSTEP_LOCAL_ROOT="$GNUSTEP_ROOT/local"
 )
 AC_MSG_RESULT($GNUSTEP_LOCAL_ROOT)
 
@@ -222,7 +222,7 @@
 --with-network-root=/usr/local/GNUstep/Network
 ],
 GNUSTEP_NETWORK_ROOT="$withval",
-GNUSTEP_NETWORK_ROOT="$GNUSTEP_ROOT/Network"
+GNUSTEP_NETWORK_ROOT="$GNUSTEP_ROOT/local"
 )
 AC_MSG_RESULT($GNUSTEP_NETWORK_ROOT)