mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Filesystem change
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@16565 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
e96c3dd9d8
commit
a830aae513
31 changed files with 419 additions and 156 deletions
21
ChangeLog
21
ChangeLog
|
|
@ -1,3 +1,24 @@
|
|||
2003-04-027 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).
|
||||
* move_obsolete_paths.sh: New file used in installation
|
||||
|
||||
Fri Apr 25 17:02:55 2003 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* GNUstep.csh.in: Use the grep -v trick to make sure that
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
MKDIRS = ../mkinstalldirs
|
||||
|
||||
# The documents to be generated
|
||||
DOCUMENT_NAME = gnustep-howto faq internals machines make userfaq
|
||||
DOCUMENT_NAME = gnustep-howto faq filesystem internals machines make userfaq
|
||||
|
||||
# The text documents to be generated
|
||||
DOCUMENT_TEXT_NAME = FAQ INSTALL README NEWS GNUstep-HOWTO ANNOUNCE
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ mkdir GNUstep
|
|||
|
||||
Next, set your local time zone. There are four ways to do this, pick
|
||||
one (see
|
||||
@file{$GNUSTEP_SYSTEM_ROOT/Libraries/Resources/NSTimeZones/zones} for
|
||||
@file{$GNUSTEP_SYSTEM_ROOT/Library/Libraries/Resources/gnustep-bsae/NSTimeZones/zones} for
|
||||
typical time zones):
|
||||
|
||||
@enumerate
|
||||
|
|
@ -327,7 +327,7 @@ something like ``defaults write NSGlobalDomain "Local Time Zone" GB''.
|
|||
|
||||
@item Set the @var{GNUSTEP_TZ} environment variable.
|
||||
|
||||
@item Create the file @file{$GNUSTEP_SYSTEM_ROOT/Libraries/Resources/NSTimeZones/localtime} with the name of the local time zone in it.
|
||||
@item Create the file @file{$GNUSTEP_SYSTEM_ROOT/Library/Libraries/Resources/gnustep-base/NSTimeZones/localtime} with the name of the local time zone in it.
|
||||
|
||||
@item Set the @var{TZ} environment variable (this may conflict with other
|
||||
software on your system though).
|
||||
|
|
@ -343,7 +343,7 @@ app:
|
|||
@itemize @bullet
|
||||
@item gdomap - Put this in a system startup file, like @file{/etc/rc.local} or @file{/etc/rc.d/rc.local} (customize for your system)
|
||||
@example
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
if [ -f $GNUSTEP_SYSTEM_ROOT/Tools/ix86/linux-gnu/gdomap ]; then
|
||||
$GNUSTEP_SYSTEM_ROOT/Tools/ix86/linux-gnu/gdomap
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1342,7 +1342,7 @@ make GNUSTEP_INSTALLATION_DIR="/GNUstep"
|
|||
This command states that the @file{/GNUstep} directory should be used as
|
||||
the installation root directory; applications in the package will be
|
||||
installed under @file{/GNUstep/Apps} directory, libraries in the package
|
||||
will be installed under the @file{/GNUstep/Libraries} directory, command
|
||||
will be installed under the @file{/GNUstep/Library/Libraries} directory, command
|
||||
line tools will be installed under the @file{/GNUstep/Tools} directory,
|
||||
and etc. By default the Makefile Package sets
|
||||
@code{GNUSTEP_INSTALLATION_DIR} to @code{GNUSTEP_LOCAL_ROOT} unless
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ else
|
|||
GNUSTEP_TARGET_LDIR = .
|
||||
endif
|
||||
|
||||
makedir = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
||||
makedir = $(GNUSTEP_SYSTEM_ROOT)/@MAKEFILES_SUFFIX@
|
||||
tooldir = $(GNUSTEP_SYSTEM_ROOT)/Tools
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
|
|
@ -118,7 +118,9 @@ else
|
|||
endif
|
||||
|
||||
install: all
|
||||
$(EC)(echo "Creating system domain: $(GNUSTEP_SYSTEM_ROOT)"; \
|
||||
$(EC)(echo "Moving paths from old heirarchy: "; \
|
||||
$(srcdir)/move_obsolete_paths.sh $(GNUSTEP_SYSTEM_ROOT) $(GNUSTEP_LOCAL_ROOT) $(GNUSTEP_USER_ROOT); \
|
||||
echo "Creating system domain: $(GNUSTEP_SYSTEM_ROOT)"; \
|
||||
$(srcdir)/create_domain_dir_tree.sh $(GNUSTEP_SYSTEM_ROOT); \
|
||||
echo "Creating local and network dirs: $(GNUSTEP_LOCAL_ROOT), $(GNUSTEP_NETWORK_ROOT)"; \
|
||||
$(srcdir)/mkinstalldirs $(GNUSTEP_LOCAL_ROOT) $(GNUSTEP_NETWORK_ROOT);\
|
||||
|
|
@ -133,6 +135,8 @@ install: all
|
|||
$(makedir)/Instance \
|
||||
$(makedir)/Instance/Shared \
|
||||
$(makedir)/Instance/Documentation)
|
||||
-$(EC) (rm -f $(GNUSTEP_SYSTEM_ROOT)/Makefiles; \
|
||||
$(LN_S) @MAKEFILES_SUFFIX@ $(GNUSTEP_SYSTEM_ROOT)/Makefiles)
|
||||
$(EC)(echo "Installing gnustep-make support software"; \
|
||||
$(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_DIR); \
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ endif
|
|||
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 @@ unset temp_path dir
|
|||
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}"
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ if [ -z "$LIBRARY_COMBO" ]; then
|
|||
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 @@ gnustep_class_path=
|
|||
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 @@ guile_paths=
|
|||
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
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ GSWBUNDLE_LD = $(BUNDLE_LD)
|
|||
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
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ endif
|
|||
#
|
||||
# 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 @@ JAVA_INSTALL_DIR = $(JAVA_INSTALLATION_DIR)
|
|||
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
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ endif
|
|||
|
||||
# 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):
|
||||
|
|
|
|||
|
|
@ -123,12 +123,12 @@ $(SCRIPTS_DIRECTORY)/config/unix.exp: _FORCE
|
|||
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\""; \
|
||||
|
|
|
|||
77
common.make
77
common.make
|
|
@ -57,7 +57,7 @@ REL_PATH_SCRIPT = $(GNUSTEP_MAKEFILES)/relative_path.sh
|
|||
|
||||
# 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 @@ export GNUSTEP_INSTALLATION_DIR
|
|||
#
|
||||
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 @@ endif
|
|||
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 @@ endif
|
|||
# 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 @@ ifeq ($(OBJC_RUNTIME_LIB), gnugc)
|
|||
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)
|
||||
|
|
|
|||
24
config.site
24
config.site
|
|
@ -32,16 +32,16 @@ if test -z "$target" -o "$target" = NONE; then
|
|||
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 @@ fi
|
|||
|
||||
# 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 @@ fi
|
|||
# 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 @@ fi
|
|||
|
||||
# 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
|
||||
|
||||
|
|
|
|||
50
configure
vendored
50
configure
vendored
|
|
@ -2898,12 +2898,19 @@ fi
|
|||
echo "$as_me:$LINENO: result: $prefix" >&5
|
||||
echo "${ECHO_T}$prefix" >&6
|
||||
|
||||
# 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. Note this doesn't change all
|
||||
# occurances.
|
||||
MAKEFILES_SUFFIX=Library/Makefiles
|
||||
|
||||
|
||||
# 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.
|
||||
|
||||
if test "$INSTALL" = "$ac_install_sh"; then
|
||||
HOST_INSTALL="$prefix/Makefiles/$INSTALL"
|
||||
HOST_INSTALL="$prefix/$MAKEFILES_SUFFIX/$INSTALL"
|
||||
else
|
||||
HOST_INSTALL="$INSTALL"
|
||||
fi
|
||||
|
|
@ -3030,14 +3037,14 @@ fi
|
|||
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.
|
||||
|
|
@ -3068,7 +3075,7 @@ echo "${ECHO_T}$gs_cv_objc_libdir" >&6
|
|||
|
||||
# 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
|
||||
|
||||
|
|
@ -4022,6 +4029,38 @@ objc_threaded=""
|
|||
fi
|
||||
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
if test x"$objc_threaded" = x""; then
|
||||
LIBS="-lobjc $saved_LIBS -lpthread $extra_LIBS"
|
||||
if test "$cross_compiling" = yes; then
|
||||
objc_threaded=""
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
objc_threaded="-lpthread $extra_LIBS"
|
||||
else
|
||||
echo "$as_me: program exited with status $ac_status" >&5
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
( exit $ac_status )
|
||||
objc_threaded=""
|
||||
fi
|
||||
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
LIBS="$saved_LIBS"
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
|
|
@ -4753,6 +4792,7 @@ s,@TAR@,$TAR,;t t
|
|||
s,@CHOWN@,$CHOWN,;t t
|
||||
s,@GNUSTEP_ROOT@,$GNUSTEP_ROOT,;t t
|
||||
s,@root_prefix@,$root_prefix,;t t
|
||||
s,@MAKEFILES_SUFFIX@,$MAKEFILES_SUFFIX,;t t
|
||||
s,@HOST_INSTALL@,$HOST_INSTALL,;t t
|
||||
s,@GNUSTEP_LOCAL_ROOT@,$GNUSTEP_LOCAL_ROOT,;t t
|
||||
s,@GNUSTEP_NETWORK_ROOT@,$GNUSTEP_NETWORK_ROOT,;t t
|
||||
|
|
|
|||
19
configure.ac
19
configure.ac
|
|
@ -183,12 +183,19 @@ AC_SUBST(GNUSTEP_ROOT)
|
|||
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. Note this doesn't change all
|
||||
# occurances.
|
||||
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 +309,14 @@ AC_SUBST(BACKEND_BUNDLE)
|
|||
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 +342,7 @@ AC_MSG_RESULT($gs_cv_objc_libdir)
|
|||
|
||||
# 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 +420,7 @@ else
|
|||
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="")
|
||||
|
|
|
|||
|
|
@ -46,20 +46,28 @@ basepath="$1"
|
|||
|
||||
${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/PostScript \
|
||||
"$basepath"/Library/Services \
|
||||
"$basepath"/Documentation/Developer \
|
||||
"$basepath"/Documentation/User \
|
||||
"$basepath"/Documentation/info \
|
||||
"$basepath"/Documentation/man \
|
||||
"$basepath"/Developer/Palettes
|
||||
"$basepath"/Library/Sounds
|
||||
|
||||
|
|
|
|||
18
debugapp.in
18
debugapp.in
|
|
@ -127,23 +127,23 @@ if [ -z "$GNUSTEP_FLATTENED" ]; then
|
|||
# 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 @@ fi
|
|||
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
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ do
|
|||
;;
|
||||
--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 @@ fi
|
|||
# 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 @@ else
|
|||
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 @@ else
|
|||
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 "$@"
|
||||
|
||||
|
|
|
|||
|
|
@ -42,10 +42,10 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
|
|||
# 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 @@ rm -rf $RPM_BUILD_ROOT
|
|||
#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 @@ rm -rf $RPM_BUILD_ROOT
|
|||
#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
|
||||
|
|
|
|||
|
|
@ -51,35 +51,35 @@ fi
|
|||
# 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"
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ for dir in $GNUSTEP_PATHLIST; do
|
|||
|
||||
# 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
|
||||
|
|
|
|||
182
move_obsolete_paths.sh
Executable file
182
move_obsolete_paths.sh
Executable file
|
|
@ -0,0 +1,182 @@
|
|||
#!/bin/sh
|
||||
# move_obsolete_paths.sh
|
||||
#
|
||||
# Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Adam Fedor <fedor@doc.com>
|
||||
# Date: April 2003
|
||||
#
|
||||
# This file is part of the GNUstep Makefile Package.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
# Move old paths from previous filesystem heirarchy to new location
|
||||
|
||||
if [ -z "$*" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for dir in $@; do
|
||||
#
|
||||
# Move from root to root/Library
|
||||
#
|
||||
subpath=Makefiles
|
||||
if [ -d $dir/$subpath ]; then
|
||||
echo -n " $dir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $dir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=Libraries
|
||||
if [ -d $dir/$subpath ]; then
|
||||
echo -n " $dir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $dir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=Headers
|
||||
if [ -d $dir/$subpath ]; then
|
||||
echo -n " $dir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $dir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=Documentation
|
||||
if [ -d $dir/$subpath ]; then
|
||||
echo -n " $dir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $dir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=Services
|
||||
if [ -d $dir/$subpath ]; then
|
||||
echo -n " $dir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $dir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# Move from root/Library/Libraries/Resources to root/Library
|
||||
#
|
||||
resourcedir=$dir/Libraries/Resources
|
||||
subpath=DocTemplates
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
echo -n " $resourcedir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $resourcedir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=DTDs
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
echo -n " $resourcedir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $resourcedir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=Images
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
echo -n " $resourcedir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $resourcedir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
subpath=KeyBindings
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
echo -n " $resourcedir/$subpath: "
|
||||
if [ -d $dir/Library/$subpath ]; then
|
||||
echo Cannot move. Already exists in new location
|
||||
else
|
||||
mv $resourcedir/$subpath $dir/Library/$subpath
|
||||
echo done
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# Remove these - will get reinstalled with gnustep-base
|
||||
#
|
||||
subpath=English.lproj
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
subpath=French.lproj
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
subpath=German.lproj
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
subpath=Italian.lproj
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
subpath=Languages
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
subpath=NSCharacterSets
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
subpath=NSTimeZones
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
|
||||
#
|
||||
# Remove these - will get reinstalled with gnustep-gui
|
||||
#
|
||||
subpath=PrinterTypes
|
||||
if [ -d $resourcedir/$subpath ]; then
|
||||
rm -rf $resourcedir/$subpath
|
||||
echo Removed $resourcedir/$subpath
|
||||
fi
|
||||
|
||||
done
|
||||
|
|
@ -47,9 +47,9 @@ do
|
|||
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
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -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 @@ else
|
|||
result="$b"
|
||||
fi
|
||||
|
||||
echo "$result"
|
||||
echo "$result"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ echo "press ^D on its own line when you are done"
|
|||
TZNAME=`cat`
|
||||
echo " "
|
||||
|
||||
GNUSTEP_TIMEZONE=$GNUSTEP_SYSTEM_ROOT/Libraries/Resources/NSTimeZones
|
||||
GNUSTEP_TIMEZONE=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/Resources/gnustep-base/NSTimeZones
|
||||
if [ -f $GNUSTEP_TIMEZONE/zones/$TZNAME ]; then
|
||||
echo Setting timezone to $TZNAME
|
||||
defaults write NSGlobalDomain "Local Time Zone" $TZNAME
|
||||
|
|
|
|||
|
|
@ -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 @@ make debug=yes
|
|||
#
|
||||
%install
|
||||
if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
|
||||
. %{gs_root}/Makefiles/GNUstep.sh
|
||||
. %{gs_root}/Library/Makefiles/GNUstep.sh
|
||||
fi
|
||||
|
||||
make debug=yes \
|
||||
|
|
|
|||
|
|
@ -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 @@ make debug=yes
|
|||
#
|
||||
%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}
|
||||
|
|
|
|||
|
|
@ -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 @@ make
|
|||
#
|
||||
%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 \
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ ifeq ($(FOUNDATION_LIB), apple)
|
|||
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 @@ ifeq ($(FOUNDATION_LIB), nx)
|
|||
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 @@ ifeq ($(FOUNDATION_LIB), nx)
|
|||
endif
|
||||
|
||||
TARGET_LIB_DIR = \
|
||||
Libraries/$(GNUSTEP_TARGET_LDIR)
|
||||
Library/Libraries/$(GNUSTEP_TARGET_LDIR)
|
||||
|
||||
ifneq ($(OBJC_COMPILER), NeXT)
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue