[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFA}: Filesystem update for gnustep-make
|
From: |
Adam Fedor |
|
Subject: |
[RFA}: Filesystem update for gnustep-make |
|
Date: |
Fri, 04 Apr 2003 20:03:15 -0700 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux ppc; en-US; rv:1.1) Gecko/20020905 |
Well, in the spirit of instability, API changes and incompatibilities
:-) I'm finally getting a good start on rearranging the filesystem as
described in:
http://www.gnustep.org/experience/documentation/filesystem.ps
Attached is the patch I'd like to commit. Probably the one thing that
might aggravate more than the ususally number of people is the move of
Makefiles to the Library subdirectory (everyone will have to change all
their scripts around, use $(GNUSTEP_MAKEFILES) instead of
$(GNUSTEP_SYSTEM_ROOT)/Makefiles in their Makefiles, etc). Perhaps it's
best to leave that as is? Or maybe make a link for a while...
Also:
1) Should library resources be in
.../Libraries/Resources/gnustep-base/Resources or just
.../Libraries/Resources/gnustep-base
2) For Nicola: Is resource-set.make meant for more than just library
resources (in the future)? Right now I've changed things so files are
always installed in $GNUSTEP_RESOURCES/blah...
P.S. gnustep-base, and other patches coming later...
2003-04-04 Adam Fedor <fedor@gnu.org>
* New filesystem structure.
Use @MAKEFILE_SUFFIX@ instead of Makefiles.
Replace $GNUSTEP_SYSTEM_ROOT/Makefiles with $GNUSTEP_MAKEFILES
Replace Libraries with Library/Libraries
Replace Headers with Library/Headers
Replace Documentation with Library/Documentation
* GNUmakefile.in, GNustep.csh.in, common.make, config.site,
debugapp.in, executable.template.in, gnustep-make.spec.in,
java-executable.template, ld_lib_path.csh, ld_lib_path.sh,
opentool.in, relative_path.sh, setlocaltz.sh,
spec-debug-alone-rules.template, spec-debug-rules.template,
spec-rules.template, target.make, which_lib.c, gswbundle.make,
java.make, test-library.make: Idem.
* configure.ac (MAKEFILES_SUFFIX): Define to Library/Makefiles
* create_domain_dir_tree.sh: Add additional Library dirs.
* resource-set.make (RESOURCE_FILES_FULL_INSTALL_DIR): Use
$(GNUSTEP_RESOURCES), not $(GNUSTEP_INSTALLATION_DIR).
Index: GNUmakefile.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/GNUmakefile.in,v
retrieving revision 1.109
diff -u -r1.109 GNUmakefile.in
--- GNUmakefile.in 15 Dec 2002 15:47:17 -0000 1.109
+++ GNUmakefile.in 5 Apr 2003 02:20:13 -0000
@@ -54,7 +54,7 @@
GNUSTEP_TARGET_LDIR = .
endif
-makedir = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
+makedir = $(GNUSTEP_SYSTEM_ROOT)/@MAKEFILES_SUFFIX@
tooldir = $(GNUSTEP_SYSTEM_ROOT)/Tools
INSTALL = @INSTALL@
Index: GNUstep.csh.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/GNUstep.csh.in,v
retrieving revision 1.56
diff -u -r1.56 GNUstep.csh.in
--- GNUstep.csh.in 26 Jan 2003 04:01:10 -0000 1.56
+++ GNUstep.csh.in 5 Apr 2003 02:20:14 -0000
@@ -37,7 +37,7 @@
setenv GNUSTEP_LOCAL_ROOT @GNUSTEP_LOCAL_ROOT@
setenv GNUSTEP_NETWORK_ROOT @GNUSTEP_NETWORK_ROOT@
-setenv GNUSTEP_MAKEFILES ${GNUSTEP_SYSTEM_ROOT}/Makefiles
+setenv GNUSTEP_MAKEFILES ${GNUSTEP_SYSTEM_ROOT}/@MAKEFILES_SUFFIX@
if ( "@GNUSTEP_MULTI_PLATFORM@" == "" ) then
setenv GNUSTEP_HOST @target@
@@ -104,7 +104,7 @@
source ${GNUSTEP_MAKEFILES}/ld_lib_path.csh
# FIXME/TODO - use GNUSTEP_PATHLIST here
-set
gnustep_class_path="${GNUSTEP_USER_ROOT}/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Libraries/Java:${GNUSTEP_NETWORK_ROOT}/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Libraries/Java"
+set
gnustep_class_path="${GNUSTEP_USER_ROOT}/Library/Libraries/Java:${GNUSTEP_LOCAL_ROOT}/Library/Libraries/Java:${GNUSTEP_NETWORK_ROOT}/Library/Libraries/Java:${GNUSTEP_SYSTEM_ROOT}/Library/Libraries/Java"
if ( ! ${?CLASSPATH} ) then
setenv CLASSPATH "${gnustep_class_path}"
@@ -115,9 +115,9 @@
unset gnustep_class_path
if ( $?GUILE_LOAD_PATH == 0 ) then
- setenv GUILE_LOAD_PATH
"${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile"
+ setenv GUILE_LOAD_PATH
"${GNUSTEP_USER_ROOT}/Library/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Library/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Library/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Library/Libraries/Guile"
else
- setenv GUILE_LOAD_PATH
"${GNUSTEP_USER_ROOT}/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Libraries/Guile:${GUILE_LOAD_PATH}"
+ setenv GUILE_LOAD_PATH
"${GNUSTEP_USER_ROOT}/Library/Libraries/Guile:${GNUSTEP_LOCAL_ROOT}/Library/Libraries/Guile:${GNUSTEP_NETWORK_ROOT}/Library/Libraries/Guile:${GNUSTEP_SYSTEM_ROOT}/Library/Libraries/Guile:${GUILE_LOAD_PATH}"
endif
#
Index: GNUstep.sh.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/GNUstep.sh.in,v
retrieving revision 1.80
diff -u -r1.80 GNUstep.sh.in
--- GNUstep.sh.in 26 Jan 2003 04:01:10 -0000 1.80
+++ GNUstep.sh.in 5 Apr 2003 02:20:14 -0000
@@ -66,7 +66,7 @@
fi
export GNUSTEP_ROOT GNUSTEP_SYSTEM_ROOT GNUSTEP_FLATTENED LIBRARY_COMBO
-GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Makefiles
+GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@
export GNUSTEP_MAKEFILES
GNUSTEP_LOCAL_ROOT=@GNUSTEP_LOCAL_ROOT@
@@ -231,9 +231,9 @@
for dir in $GNUSTEP_PATHLIST; do
if [ -z "$gnustep_class_path" ]; then
- gnustep_class_path="$dir/Libraries/Java"
+ gnustep_class_path="$dir/Library/Libraries/Java"
else
- gnustep_class_path="$gnustep_class_path:$dir/Libraries/Java"
+ gnustep_class_path="$gnustep_class_path:$dir/Library/Libraries/Java"
fi
done
@@ -261,9 +261,9 @@
for dir in $GNUSTEP_PATHLIST; do
if [ -z "$guile_paths" ]; then
- guile_paths="$dir/Libraries/Guile"
+ guile_paths="$dir/Library/Libraries/Guile"
else
- guile_paths="$guile_paths:$dir/Libraries/Guile"
+ guile_paths="$guile_paths:$dir/Library/Libraries/Guile"
fi
done
Index: common.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/common.make,v
retrieving revision 1.128
diff -u -r1.128 common.make
--- common.make 9 Jan 2003 18:05:41 -0000 1.128
+++ common.make 5 Apr 2003 02:20:14 -0000
@@ -57,7 +57,7 @@
# Take the makefiles from the system root
ifeq ($(GNUSTEP_MAKEFILES),)
- GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
+ GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Library/Makefiles
endif
#
@@ -186,15 +186,16 @@
#
GNUSTEP_APPS = $(GNUSTEP_INSTALLATION_DIR)/Applications
GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools
+GNUSTEP_LIBRARY = $(GNUSTEP_INSTALLATION_DIR)/Library
GNUSTEP_SERVICES = $(GNUSTEP_INSTALLATION_DIR)/Library/Services
-GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Headers
+GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
GNUSTEP_BUNDLES = $(GNUSTEP_INSTALLATION_DIR)/Library/Bundles
GNUSTEP_FRAMEWORKS = $(GNUSTEP_INSTALLATION_DIR)/Library/Frameworks
GNUSTEP_PALETTES = $(GNUSTEP_INSTALLATION_DIR)/Developer/Palettes
-GNUSTEP_LIBRARIES = $(GNUSTEP_INSTALLATION_DIR)/Libraries
-GNUSTEP_RESOURCES = $(GNUSTEP_INSTALLATION_DIR)/Libraries/Resources
-GNUSTEP_JAVA = $(GNUSTEP_INSTALLATION_DIR)/Libraries/Java
-GNUSTEP_DOCUMENTATION = $(GNUSTEP_INSTALLATION_DIR)/Documentation
+GNUSTEP_LIBRARIES = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
+GNUSTEP_RESOURCES =
$(GNUSTEP_INSTALLATION_DIR)/Library/Libraries/Resources
+GNUSTEP_JAVA =
$(GNUSTEP_INSTALLATION_DIR)/Library/Libraries/Java
+GNUSTEP_DOCUMENTATION =
$(GNUSTEP_INSTALLATION_DIR)/Library/Documentation
GNUSTEP_DOCUMENTATION_MAN = $(GNUSTEP_DOCUMENTATION)/man
GNUSTEP_DOCUMENTATION_INFO = $(GNUSTEP_DOCUMENTATION)/info
@@ -209,38 +210,38 @@
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_HEADERS_DIRS = \
- $(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_USER_ROOT)/Headers \
- $(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_LOCAL_ROOT)/Headers \
- $(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_NETWORK_ROOT)/Headers \
- $(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_SYSTEM_ROOT)/Headers
+ $(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
+ $(GNUSTEP_USER_ROOT)/Library/Headers \
+ $(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
+ $(GNUSTEP_LOCAL_ROOT)/Library/Headers \
+ $(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
+ $(GNUSTEP_NETWORK_ROOT)/Library/Headers \
+ $(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
+ $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
GNUSTEP_LIBRARIES_DIRS = \
- $(GNUSTEP_USER_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
- $(GNUSTEP_USER_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_LOCAL_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
- $(GNUSTEP_LOCAL_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_NETWORK_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
- $(GNUSTEP_NETWORK_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) \
- $(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
- $(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR)
+ $(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)
else # GNUSTEP_FLATTENED
GNUSTEP_HEADERS_DIRS = \
- $(GNUSTEP_USER_ROOT)/Headers \
- $(GNUSTEP_LOCAL_ROOT)/Headers \
- $(GNUSTEP_NETWORK_ROOT)/Headers \
- $(GNUSTEP_SYSTEM_ROOT)/Headers
+ $(GNUSTEP_USER_ROOT)/Library/Headers \
+ $(GNUSTEP_LOCAL_ROOT)/Library/Headers \
+ $(GNUSTEP_NETWORK_ROOT)/Library/Headers \
+ $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
GNUSTEP_LIBRARIES_DIRS = \
- $(GNUSTEP_USER_ROOT)/Libraries \
- $(GNUSTEP_LOCAL_ROOT)/Libraries \
- $(GNUSTEP_NETWORK_ROOT)/Libraries \
- $(GNUSTEP_SYSTEM_ROOT)/Libraries
+ $(GNUSTEP_USER_ROOT)/Library/Libraries \
+ $(GNUSTEP_LOCAL_ROOT)/Library/Libraries \
+ $(GNUSTEP_NETWORK_ROOT)/Library/Libraries \
+ $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
endif # GNUSTEP_FLATTENED
@@ -281,10 +282,10 @@
# Determine Foundation header subdirectory based upon library combo
#
GNUSTEP_HEADERS_FND_DIRS = \
- $(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
- $(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
- $(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_FND_DIR) \
- $(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_FND_DIR)
+ $(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)
ifeq ($(FOUNDATION_LIB), fd)
@@ -307,10 +308,10 @@
OBJC_RUNTIME = GNU
endif
GNUSTEP_HEADERS_FND_DIRS += \
-
$(GNUSTEP_USER_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
\
-
$(GNUSTEP_LOCAL_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
\
-
$(GNUSTEP_NETWORK_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
\
-
$(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_DIR)/$(OBJC_RUNTIME)
+
$(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)
endif
ifeq ($(REMOVE_EMPTY_DIRS), yes)
Index: config.site
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/config.site,v
retrieving revision 1.9
diff -u -r1.9 config.site
--- config.site 9 Oct 2001 14:51:37 -0000 1.9
+++ config.site 5 Apr 2003 02:20:14 -0000
@@ -32,16 +32,16 @@
GNUSTEP_TARGET_OS=$GNUSTEP_HOST_OS
else
# The user did specify a target, so canonicalize and clean
- GNUSTEP_TARGET=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $target`
- GNUSTEP_TARGET_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_TARGET`
- GNUSTEP_TARGET_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh
$GNUSTEP_TARGET`
- GNUSTEP_TARGET_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_TARGET`
+ GNUSTEP_TARGET=`$GNUSTEP_MAKEFILES/config.sub $target`
+ GNUSTEP_TARGET_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_TARGET`
+ GNUSTEP_TARGET_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_TARGET`
+ GNUSTEP_TARGET_OS=`$GNUSTEP_MAKEFILES/os.sh $GNUSTEP_TARGET`
fi
# Clean the target
-GNUSTEP_TARGET_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh
$GNUSTEP_TARGET_OS`
-GNUSTEP_TARGET_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh
$GNUSTEP_TARGET_VENDOR`
-GNUSTEP_TARGET_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh
$GNUSTEP_TARGET_CPU`
+GNUSTEP_TARGET_OS=`$GNUSTEP_MAKEFILES/clean_os.sh $GNUSTEP_TARGET_OS`
+GNUSTEP_TARGET_VENDOR=`$GNUSTEP_MAKEFILES/clean_vendor.sh
$GNUSTEP_TARGET_VENDOR`
+GNUSTEP_TARGET_CPU=`$GNUSTEP_MAKEFILES/clean_cpu.sh $GNUSTEP_TARGET_CPU`
# Set the installation prefix
if test "$prefix" = NONE ; then
@@ -71,7 +71,7 @@
# Change the data directory default
if test "$datadir" = "\${prefix}/share" ; then
- datadir="\${prefix}/Libraries/share"
+ datadir="\${prefix}/Library/Libraries/share"
fi
# xxx What about sysconfdir?
@@ -81,9 +81,9 @@
# Change the library directory default
if test "$libdir" = "\${exec_prefix}/lib" ; then
if [ -z "$GNUSTEP_FLATTENED" ]; then
-
libdir="\${exec_prefix}/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
+
libdir="\${exec_prefix}/Library/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
else
- libdir="\${exec_prefix}/Libraries"
+ libdir="\${exec_prefix}/Library/Libraries"
fi
fi
@@ -96,11 +96,11 @@
# Change the info directory default
if test "$infodir" = "\${prefix}/info" ; then
- infodir="\${prefix}/Documentation/info"
+ infodir="\${prefix}/Library/Documentation/info"
fi
# Change the man directory default
if test "$mandir" = "\${prefix}/man" ; then
- mandir="\${prefix}/Documentation/man"
+ mandir="\${prefix}/Library/Documentation/man"
fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/configure.ac,v
retrieving revision 1.11
diff -u -r1.11 configure.ac
--- configure.ac 23 Mar 2003 06:53:16 -0000 1.11
+++ configure.ac 5 Apr 2003 02:20:21 -0000
@@ -183,12 +183,18 @@
AC_SUBST(root_prefix)
AC_MSG_RESULT($prefix)
+# Makefiles directory location is in a bit of flux now. To keep the
+# Makefiles dir in the previous location, reset this variable to
+# 'Makefiles' and regenerate configure
+MAKEFILES_SUFFIX=Library/Makefiles
+AC_SUBST(MAKEFILES_SUFFIX)
+
# HOST_INSTALL is the name of the install program in config.make so set it up
# to point to the install-sh script in the GNUstep tree if no system install is
# found.
AC_SUBST(HOST_INSTALL)
if test "$INSTALL" = "$ac_install_sh"; then
- HOST_INSTALL="$prefix/Makefiles/$INSTALL"
+ HOST_INSTALL="$prefix/$MAKEFILES_SUFFIX/$INSTALL"
else
HOST_INSTALL="$INSTALL"
fi
@@ -302,14 +308,14 @@
CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
# Set location of GNUstep dirs for later use
-GNUSTEP_HDIR="$prefix/Headers"
+GNUSTEP_HDIR="$prefix/Library/Headers"
if test "$GNUSTEP_FLATTENED" = yes; then
- GNUSTEP_LDIR="$prefix/Libraries"
+ GNUSTEP_LDIR="$prefix/Library/Libraries"
else
clean_target_os=`$srcdir/clean_os.sh $target_os`
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
obj_dir="$clean_target_cpu/$clean_target_os"
- GNUSTEP_LDIR="$prefix/Libraries/$obj_dir"
+ GNUSTEP_LDIR="$prefix/Library/Libraries/$obj_dir"
fi
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
@@ -335,7 +341,7 @@
# The following are needed to compile the test programs
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
- OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Headers"
+ OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
fi
@@ -413,7 +419,7 @@
objc_threaded="-lthread $extra_LIBS",
objc_threaded="", objc_threaded="")
if test x"$objc_threaded" = x""; then
- LIBS="-lobjc $saved_LIBS -lpthread $extra_LIBS""
+ LIBS="-lobjc $saved_LIBS -lpthread $extra_LIBS"
AC_TRY_RUN([#include "config_thread.m"],
objc_threaded="-lpthread $extra_LIBS",
objc_threaded="", objc_threaded="")
Index: create_domain_dir_tree.sh
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/create_domain_dir_tree.sh,v
retrieving revision 1.3
diff -u -r1.3 create_domain_dir_tree.sh
--- create_domain_dir_tree.sh 3 Jan 2003 01:01:11 -0000 1.3
+++ create_domain_dir_tree.sh 5 Apr 2003 02:20:21 -0000
@@ -46,20 +46,29 @@
${mydir}/mkinstalldirs "$basepath" \
"$basepath"/Applications \
- "$basepath"/Libraries/${GNUSTEP_TARGET_LDIR} \
- "$basepath"/Libraries/Resources \
- "$basepath"/Libraries/Java \
- "$basepath"/Headers/${GNUSTEP_TARGET_DIR} \
+ "$basepath"/Developer/Palettes \
"$basepath"/Tools/${GNUSTEP_TARGET_LDIR} \
"$basepath"/Tools/Resources \
"$basepath"/Tools/Java \
+ "$basepath"/Library/ApplicationSupport \
"$basepath"/Library/Bundles \
+ "$basepath"/Library/ColorPickers \
"$basepath"/Library/Colors \
+ "$basepath"/Library/DocTemplates \
+ "$basepath"/Library/Documentation/Developer \
+ "$basepath"/Library/Documentation/User \
+ "$basepath"/Library/Documentation/info \
+ "$basepath"/Library/Documentation/man \
+ "$basepath"/Library/Fonts \
"$basepath"/Library/Frameworks \
+ "$basepath"/Library/Headers/${GNUSTEP_TARGET_DIR} \
+ "$basepath"/Library/Images \
+ "$basepath"/Library/KeyBindings \
+ "$basepath"/Library/Libraries/${GNUSTEP_TARGET_LDIR} \
+ "$basepath"/Library/Libraries/Resources \
+ "$basepath"/Library/Libraries/Java \
+ "$basepath"/Library/Palettes \
"$basepath"/Library/PostScript \
"$basepath"/Library/Services \
- "$basepath"/Documentation/Developer \
- "$basepath"/Documentation/User \
- "$basepath"/Documentation/info \
- "$basepath"/Documentation/man \
- "$basepath"/Developer/Palettes
+ "$basepath"/Library/Sounds
+
Index: debugapp.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/debugapp.in,v
retrieving revision 1.28
diff -u -r1.28 debugapp.in
--- debugapp.in 30 Dec 2002 16:29:55 -0000 1.28
+++ debugapp.in 5 Apr 2003 02:20:22 -0000
@@ -127,23 +127,23 @@
# Determine the host information
#
if [ -z "$GNUSTEP_HOST" ]; then
- GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
- GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub
$GNUSTEP_HOST`
+ GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.guess`
+ GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.sub
$GNUSTEP_HOST`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then
- GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh
$GNUSTEP_HOST`
- GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh
$GNUSTEP_HOST_CPU`
+ GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/cpu.sh
$GNUSTEP_HOST`
+
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_cpu.sh
$GNUSTEP_HOST_CPU`
export GNUSTEP_HOST_CPU
fi
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
- GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh
$GNUSTEP_HOST`
- GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh
$GNUSTEP_HOST_VENDOR`
+
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/vendor.sh
$GNUSTEP_HOST`
+
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_vendor.sh
$GNUSTEP_HOST_VENDOR`
export GNUSTEP_HOST_VENDOR
fi
if [ -z "$GNUSTEP_HOST_OS" ]; then
- GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
- GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh
$GNUSTEP_HOST_OS`
+ GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/os.sh
$GNUSTEP_HOST`
+
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_os.sh
$GNUSTEP_HOST_OS`
export GNUSTEP_HOST_OS
fi
@@ -161,7 +161,7 @@
appname=`echo $app | sed 's/\.[a-z]*$//'`
appname=`basename $appname`
appname="$appname$EXEEXT"
-. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
+. $GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/ld_lib_path.sh
if [ "$LIBRARY_COMBO" = nx-nx-nx -a $GNUSTEP_HOST_OS = nextstep4 ]; then
Index: executable.template.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/executable.template.in,v
retrieving revision 1.19
diff -u -r1.19 executable.template.in
--- executable.template.in 30 Dec 2002 16:29:55 -0000 1.19
+++ executable.template.in 5 Apr 2003 02:20:22 -0000
@@ -60,9 +60,9 @@
;;
--library-combo=*)
tmp_root="$GNUSTEP_SYSTEM_ROOT"
- . "$tmp_root/Makefiles/GNUstep-reset.sh"
+ . "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep-reset.sh"
LIBRARY_COMBO=`echo $1 | sed 's/--library-combo=//'`
- . "$tmp_root/Makefiles/GNUstep.sh"
+ . "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep.sh"
shift
;;
--available-platforms)
@@ -163,23 +163,23 @@
# Determine the host information
#
if [ -z "$GNUSTEP_HOST" ]; then
- GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
- GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub
$GNUSTEP_HOST)`
+ GNUSTEP_HOST=`(cd /tmp;
$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.guess)`
+ GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/config.sub
$GNUSTEP_HOST)`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then
- GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
- GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh
$GNUSTEP_HOST_CPU`
+ GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/cpu.sh
$GNUSTEP_HOST`
+ GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_cpu.sh
$GNUSTEP_HOST_CPU`
export GNUSTEP_HOST_CPU
fi
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
- GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
- GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh
$GNUSTEP_HOST_VENDOR`
+ GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/vendor.sh
$GNUSTEP_HOST`
+ GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_vendor.sh
$GNUSTEP_HOST_VENDOR`
export GNUSTEP_HOST_VENDOR
fi
if [ -z "$GNUSTEP_HOST_OS" ]; then
- GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
- GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
+ GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/os.sh $GNUSTEP_HOST`
+ GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/clean_os.sh
$GNUSTEP_HOST_OS`
export GNUSTEP_HOST_OS
fi
@@ -205,9 +205,9 @@
if [ -x "$lib_combo/$appname" ]; then
# Switch LIBRARY_COMBO on the fly
tmp_root="$GNUSTEP_SYSTEM_ROOT"
- . "$tmp_root/Makefiles/GNUstep-reset.sh"
+ . "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep-reset.sh"
LIBRARY_COMBO="$lib_combo"
- . "$tmp_root/Makefiles/GNUstep.sh"
+ . "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep.sh"
# Use the found executable
relative_path="$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname"
found=yes
@@ -243,7 +243,7 @@
fi
# Load up LD_LIBRARY_PATH
-. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
+. $GNUSTEP_SYSTEM_ROOT/@MAKEFILES_SUFFIX@/ld_lib_path.sh
exec $full_appname/$relative_path "$@"
Index: gnustep-make.spec.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/gnustep-make.spec.in,v
retrieving revision 1.12
diff -u -r1.12 gnustep-make.spec.in
--- gnustep-make.spec.in 26 Jul 2001 18:34:42 -0000 1.12
+++ gnustep-make.spec.in 5 Apr 2003 02:20:23 -0000
@@ -42,10 +42,10 @@
# Create profile files
echo "#!/bin/sh" > mygnustep.sh
-echo ". %{gs_prefix}/System/Makefiles/GNUstep.sh" >> mygnustep.sh
+echo ". %{gs_prefix}/System/@MAKEFILES_SUFFIX@/GNUstep.sh" >> mygnustep.sh
#echo "#!/bin/csh" > mygnustep.csh
-#echo "source %{gs_prefix}/System/Makefiles/GNUstep.csh" >> mygnustep.csh
+#echo "source %{gs_prefix}/System/@MAKEFILES_SUFFIX@/GNUstep.csh" >>
mygnustep.csh
chmod 755 mygnustep.*
mv mygnustep.sh $RPM_BUILD_ROOT/etc/profile.d/GNUstep.sh
@@ -76,9 +76,9 @@
#if [ $1 = 1]; then
#%ifos Linux
# if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
-# . %{gs_root}/Makefiles/GNUstep.sh
+# . %{gs_root}/@MAKEFILES_SUFFIX@/GNUstep.sh
# fi
-# grep -q
'%{gs_prefix}/System/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}'
/etc/ld.so.conf || echo
"%{gs_prefix}/System/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}"
>> /etc/ld.so.conf
+# grep -q
'%{gs_prefix}/System/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}'
/etc/ld.so.conf || echo
"%{gs_prefix}/System/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}"
>> /etc/ld.so.conf
#%endif
#fi
@@ -86,10 +86,10 @@
#if [ $1 = 0 ]; then
#%ifos Linux
# if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
-# . %{gs_root}/Makefiles/GNUstep.sh
+# . %{gs_root}/@MAKEFILES_SUFFIX@/GNUstep.sh
# fi
# mv -f /etc/ld.so.conf /etc/ld.so.conf.orig
-# grep -v
"^%{gs_prefix}/System/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}"
/etc/ld.so.conf.orig > /etc/ld.so.conf
+# grep -v
"^%{gs_prefix}/System/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/%{gs_libcombo}"
/etc/ld.so.conf.orig > /etc/ld.so.conf
# rm -f /etc/ld.so.conf.orig
#%endif
#fi
Index: java-executable.template
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/java-executable.template,v
retrieving revision 1.6
diff -u -r1.6 java-executable.template
--- java-executable.template 9 Jul 2001 16:08:29 -0000 1.6
+++ java-executable.template 5 Apr 2003 02:20:23 -0000
@@ -51,35 +51,35 @@
# Determine the host information if needed
#
if [ -z "$GNUSTEP_HOST" ]; then
- GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
- GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub
$GNUSTEP_HOST)`
+ GNUSTEP_HOST=`(cd /tmp;
$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/config.guess)`
+ GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Library/Makefiles/config.sub
$GNUSTEP_HOST)`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then
- GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
- GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh
$GNUSTEP_HOST_CPU`
+ GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/cpu.sh
$GNUSTEP_HOST`
+ GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/clean_cpu.sh
$GNUSTEP_HOST_CPU`
export GNUSTEP_HOST_CPU
fi
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
- GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh
$GNUSTEP_HOST`
- GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh
$GNUSTEP_HOST_VENDOR`
+ GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/vendor.sh
$GNUSTEP_HOST`
+
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/clean_vendor.sh
$GNUSTEP_HOST_VENDOR`
export GNUSTEP_HOST_VENDOR
fi
if [ -z "$GNUSTEP_HOST_OS" ]; then
- GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
- GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh
$GNUSTEP_HOST_OS`
+ GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/os.sh
$GNUSTEP_HOST`
+ GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Library/Makefiles/clean_os.sh
$GNUSTEP_HOST_OS`
export GNUSTEP_HOST_OS
fi
#
# Load up LD_LIBRARY_PATH
#
-. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
+. $GNUSTEP_SYSTEM_ROOT/Library/Makefiles/ld_lib_path.sh
#
# Load up CLASSPATH
#
-gnustep_class_path="$GNUSTEP_USER_ROOT/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Libraries/Java"
+gnustep_class_path="$GNUSTEP_USER_ROOT/Library/Libraries/Java:$GNUSTEP_LOCAL_ROOT/Library/Libraries/Java:$GNUSTEP_NETWORK_ROOT/Library/Libraries/Java:$GNUSTEP_SYSTEM_ROOT/Library/Libraries/Java"
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$gnustep_class_path"
Index: ld_lib_path.csh
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/ld_lib_path.csh,v
retrieving revision 1.17
diff -u -r1.17 ld_lib_path.csh
--- ld_lib_path.csh 31 Dec 2002 04:16:16 -0000 1.17
+++ ld_lib_path.csh 5 Apr 2003 02:20:23 -0000
@@ -26,11 +26,11 @@
# operating system name.
if ( "$GNUSTEP_FLATTENED" == "" ) then
- set
last_path_part="Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}"
- set tool_path_part="Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
+ set
last_path_part="Library/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}"
+ set tool_path_part="Library/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
else
- set last_path_part="Libraries"
- set tool_path_part="Libraries"
+ set last_path_part="Library/Libraries"
+ set tool_path_part="Library/Libraries"
endif
set host_os=${GNUSTEP_HOST_OS}
Index: ld_lib_path.sh
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/ld_lib_path.sh,v
retrieving revision 1.30
diff -u -r1.30 ld_lib_path.sh
--- ld_lib_path.sh 31 Dec 2002 04:16:16 -0000 1.30
+++ ld_lib_path.sh 5 Apr 2003 02:20:23 -0000
@@ -44,9 +44,9 @@
# prepare the path_fragment for this dir
if [ -z "$GNUSTEP_FLATTENED" ]; then
-
path_fragment="$dir/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$dir/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
+
path_fragment="$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
else
- path_fragment="$dir/Libraries"
+ path_fragment="$dir/Library/Libraries"
fi
# Append the path_fragment to lib_paths
Index: opentool.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/opentool.in,v
retrieving revision 1.19
diff -u -r1.19 opentool.in
--- opentool.in 25 Jun 2002 18:01:46 -0000 1.19
+++ opentool.in 5 Apr 2003 02:20:23 -0000
@@ -47,9 +47,9 @@
case $1 in
--library-combo=*)
tmp_root="$GNUSTEP_SYSTEM_ROOT"
- . "$tmp_root/Makefiles/GNUstep-reset.sh"
+ . "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep-reset.sh"
LIBRARY_COMBO=`echo $1 | sed 's/--library-combo=//'`
- . "$tmp_root/Makefiles/GNUstep.sh"
+ . "$tmp_root/@MAKEFILES_SUFFIX@/GNUstep.sh"
echo "Switched to library combo $LIBRARY_COMBO"
shift
;;
Index: relative_path.sh
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/relative_path.sh,v
retrieving revision 1.3
diff -u -r1.3 relative_path.sh
--- relative_path.sh 12 Jun 2002 12:55:29 -0000 1.3
+++ relative_path.sh 5 Apr 2003 02:20:23 -0000
@@ -37,7 +37,7 @@
# need this for frameworks, which are particularly complex and
# delicate. For example, to create the link
#
-# /usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
+# /usr/GNUstep/System/Library/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
# -->
../../../../Frameworks/nicola.framework/Versions/Current/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
#
# (and where the paths are actually computed by make variables which
@@ -45,8 +45,8 @@
# it's not obvious what the relationship is between the two paths, and
# you only have the absolute paths) we do -
#
-# cd /usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
-# $(LN_S) `$(RELATIVE_PATH_SCRIPT)
/usr/GNUstep/System/Frameworks/nicola.framework/Versions/Current/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
/usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu/`
+# cd
/usr/GNUstep/System/Library/Libraries/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
+# $(LN_S) `$(RELATIVE_PATH_SCRIPT)
/usr/GNUstep/System/Frameworks/nicola.framework/Versions/Current/ix86/linux-gnu/gnu-gnu-gnu/libnicola.so
/usr/GNUstep/System/Library/Libraries/ix86/linux-gnu/gnu-gnu-gnu/`
#
# which creates the link. We need to use the minimum path because
# that is the most relocatable possible path. I consider all this a
@@ -129,4 +129,4 @@
result="$b"
fi
-echo "$result"
\ No newline at end of file
+echo "$result"
Index: setlocaltz.sh
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/setlocaltz.sh,v
retrieving revision 1.2
diff -u -r1.2 setlocaltz.sh
--- setlocaltz.sh 13 Dec 2000 05:11:29 -0000 1.2
+++ setlocaltz.sh 5 Apr 2003 02:20:23 -0000
@@ -29,7 +29,7 @@
TZNAME=`cat`
echo " "
-GNUSTEP_TIMEZONE=$GNUSTEP_SYSTEM_ROOT/Libraries/Resources/NSTimeZones
+GNUSTEP_TIMEZONE=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/gnustep-base/Resources/NSTimeZones
if [ -f $GNUSTEP_TIMEZONE/zones/$TZNAME ]; then
echo Setting timezone to $TZNAME
defaults write NSGlobalDomain "Local Time Zone" $TZNAME
Index: spec-debug-alone-rules.template
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/spec-debug-alone-rules.template,v
retrieving revision 1.4
diff -u -r1.4 spec-debug-alone-rules.template
--- spec-debug-alone-rules.template 11 Oct 2002 15:33:35 -0000 1.4
+++ spec-debug-alone-rules.template 5 Apr 2003 02:20:23 -0000
@@ -9,7 +9,7 @@
#
%build
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
- . %{gs_root}/Makefiles/GNUstep.sh
+ . %{gs_root}/Library/Makefiles/GNUstep.sh
fi
if [ "%{gs_configure}" = "YES" ]; then
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_root}
@@ -21,7 +21,7 @@
#
%install
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
- . %{gs_root}/Makefiles/GNUstep.sh
+ . %{gs_root}/Library/Makefiles/GNUstep.sh
fi
make debug=yes \
Index: spec-debug-rules.template
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/spec-debug-rules.template,v
retrieving revision 1.6
diff -u -r1.6 spec-debug-rules.template
--- spec-debug-rules.template 11 Oct 2002 15:33:35 -0000 1.6
+++ spec-debug-rules.template 5 Apr 2003 02:20:23 -0000
@@ -9,7 +9,7 @@
#
%build
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
- . %{gs_root}/Makefiles/GNUstep.sh
+ . %{gs_root}/Library/Makefiles/GNUstep.sh
fi
if [ "%{gs_configure}" = "YES" ]; then
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_root}
@@ -22,7 +22,7 @@
#
%install
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
- . %{gs_root}/Makefiles/GNUstep.sh
+ . %{gs_root}/Library/Makefiles/GNUstep.sh
fi
# build the non debugging file list
mkdir tmp-rpm-build-%{gs_name}
Index: spec-rules.template
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/spec-rules.template,v
retrieving revision 1.5
diff -u -r1.5 spec-rules.template
--- spec-rules.template 11 Oct 2002 15:33:35 -0000 1.5
+++ spec-rules.template 5 Apr 2003 02:20:23 -0000
@@ -9,7 +9,7 @@
#
%build
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
- . %{gs_root}/Makefiles/GNUstep.sh
+ . %{gs_root}/Library/Makefiles/GNUstep.sh
fi
if [ "%{gs_configure}" = "YES" ]; then
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{gs_root}
@@ -21,7 +21,7 @@
#
%install
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
- . %{gs_root}/Makefiles/GNUstep.sh
+ . %{gs_root}/Library/Makefiles/GNUstep.sh
fi
make INSTALL_ROOT_DIR=$RPM_BUILD_ROOT \
Index: target.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/target.make,v
retrieving revision 1.138
diff -u -r1.138 target.make
--- target.make 23 Mar 2003 06:53:16 -0000 1.138
+++ target.make 5 Apr 2003 02:20:24 -0000
@@ -206,7 +206,7 @@
endif
TARGET_LIB_DIR = \
- Libraries/$(GNUSTEP_TARGET_LDIR)
+ Library/Libraries/$(GNUSTEP_TARGET_LDIR)
ifneq ($(OBJC_COMPILER), NeXT)
SHARED_LIB_LINK_CMD = \
@@ -403,7 +403,7 @@
endif
TARGET_LIB_DIR = \
- Libraries/$(GNUSTEP_TARGET_LDIR)
+ Library/Libraries/$(GNUSTEP_TARGET_LDIR)
ifneq ($(OBJC_COMPILER), NeXT)
SHARED_LIB_LINK_CMD = \
@@ -473,7 +473,7 @@
endif
TARGET_LIB_DIR = \
- Libraries/$(GNUSTEP_TARGET_LDIR)
+ Library/Libraries/$(GNUSTEP_TARGET_LDIR)
ifneq ($(OBJC_COMPILER), NeXT)
SHARED_LIB_LINK_CMD = \
Index: which_lib.c
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/which_lib.c,v
retrieving revision 1.18
diff -u -r1.18 which_lib.c
--- which_lib.c 15 Jan 2002 00:52:10 -0000 1.18
+++ which_lib.c 5 Apr 2003 02:20:25 -0000
@@ -27,8 +27,8 @@
* a list of library search paths in the GCC notation, as in
-L/usr/lib/opt/hack/
- -L/usr/GNUstep/Local/Libraries/ix86/linux-gnu/gnu-gnu-gnu
- -L/usr/GNUstep/System/Libraries/ix86/linux-gnu/gnu-gnu-gnu
+ -L/usr/GNUstep/Local/Library/Libraries/ix86/linux-gnu/gnu-gnu-gnu
+ -L/usr/GNUstep/System/Library/Libraries/ix86/linux-gnu/gnu-gnu-gnu
(order is important, paths are searched in the order they are listed);
* a list of libraries in the GCC notation, as in
Index: Instance/gswbundle.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/gswbundle.make,v
retrieving revision 1.11
diff -u -r1.11 gswbundle.make
--- Instance/gswbundle.make 22 Oct 2002 00:27:39 -0000 1.11
+++ Instance/gswbundle.make 5 Apr 2003 02:20:25 -0000
@@ -47,7 +47,7 @@
GSWBUNDLE_LDFLAGS = $(BUNDLE_LDFLAGS)
ifeq ($(GSWBUNDLE_INSTALL_DIR),)
-GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Libraries
+GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
endif
# The name of the bundle is in the BUNDLE_NAME variable.
# The list of languages the bundle is localized in are in xxx_LANGUAGES
Index: Instance/java.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/java.make,v
retrieving revision 1.8
diff -u -r1.8 java.make
--- Instance/java.make 26 Sep 2002 00:31:23 -0000 1.8
+++ Instance/java.make 5 Apr 2003 02:20:27 -0000
@@ -41,7 +41,7 @@
#
# JAVA_INSTALL_DIR contains the directory where you want to
# install your classes - it defaults to $(GNUSTEP_JAVA), which is
-# $(GNUSTEP_LOCAL_ROOT)/Libraries/Java/.
+# $(GNUSTEP_LOCAL_ROOT)/Library/Libraries/Java/.
#
# If you have all your files in a directory but want them to be
# installed with a different relative path, you can simply redefine
@@ -71,7 +71,7 @@
endif
# This is the directory where the java classses get
-# installed. Normally this is /usr/GNUstep/Local/Libraries/Java/
+# installed. Normally this is /usr/GNUstep/Local/Library/Libraries/Java/
ifeq ($(JAVA_INSTALL_DIR),)
JAVA_INSTALL_DIR = $(GNUSTEP_JAVA)
endif
Index: Instance/resource-set.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/resource-set.make,v
retrieving revision 1.3
diff -u -r1.3 resource-set.make
--- Instance/resource-set.make 19 Mar 2002 13:06:56 -0000 1.3
+++ Instance/resource-set.make 5 Apr 2003 02:20:27 -0000
@@ -42,7 +42,7 @@
# Determine installation dir
RESOURCE_FILES_INSTALL_DIR = $($(GNUSTEP_INSTANCE)_RESOURCE_FILES_INSTALL_DIR)
-RESOURCE_FILES_FULL_INSTALL_DIR =
$(GNUSTEP_INSTALLATION_DIR)/$(RESOURCE_FILES_INSTALL_DIR)
+RESOURCE_FILES_FULL_INSTALL_DIR =
$(GNUSTEP_RESOURCES)/$(RESOURCE_FILES_INSTALL_DIR)
# Rule to build the installation dir
$(RESOURCE_FILES_FULL_INSTALL_DIR):
Index: Instance/test-library.make
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/make/Instance/test-library.make,v
retrieving revision 1.6
diff -u -r1.6 test-library.make
--- Instance/test-library.make 22 Oct 2002 00:27:39 -0000 1.6
+++ Instance/test-library.make 5 Apr 2003 02:20:27 -0000
@@ -123,12 +123,12 @@
echo "set OBJC_RUNTIME $(OBJC_RUNTIME)"; \
echo "set FOUNDATION_LIBRARY $(FOUNDATION_LIB)"; \
echo ""; \
- echo "if {[file isdirectory $(GNUSTEP_USER_ROOT)/Libraries/ObjCTest]}
{"; \
- echo " set OBJCTEST_DIR $(GNUSTEP_USER_ROOT)/Libraries/ObjCTest"; \
- echo "} elseif {[file isdirectory
$(GNUSTEP_LOCAL_ROOT)/Libraries/ObjCTest]} {"; \
- echo " set OBJCTEST_DIR $(GNUSTEP_LOCAL_ROOT)/Libraries/ObjCTest"; \
- echo "} elseif {[file isdirectory
$(GNUSTEP_SYSTEM_ROOT)/Libraries/ObjCTest]} {"; \
- echo " set OBJCTEST_DIR $(GNUSTEP_SYSTEM_ROOT)/Libraries/ObjCTest"; \
+ echo "if {[file isdirectory
$(GNUSTEP_USER_ROOT)/Library/Libraries/ObjCTest]} {"; \
+ echo " set OBJCTEST_DIR
$(GNUSTEP_USER_ROOT)/Library/Libraries/ObjCTest"; \
+ echo "} elseif {[file isdirectory
$(GNUSTEP_LOCAL_ROOT)/Library/Libraries/ObjCTest]} {"; \
+ echo " set OBJCTEST_DIR
$(GNUSTEP_LOCAL_ROOT)/Library/Libraries/ObjCTest"; \
+ echo "} elseif {[file isdirectory
$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/ObjCTest]} {"; \
+ echo " set OBJCTEST_DIR
$(GNUSTEP_SYSTEM_ROOT)/Library/Libraries/ObjCTest"; \
echo "}"; \
echo "set objdir `pwd`"; \
echo "source \"\$$OBJCTEST_DIR/common.exp\""; \
- [RFA}: Filesystem update for gnustep-make,
Adam Fedor <=