gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify search for framework location

Browse source 
and change order to prevent problems in obscure case where GNUstep
is installed in user's home.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@18554 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-02-08 04:06:20 +00:00
parent 03069a977b
commit 10b680e950
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2004-02-07 Adam Fedor <fedor@gnu.org>
* Instance/framework.make: Simplify search for framework location
and change order to prevent problems in obscure case where GNUstep
is installed in user's home.
2004-01-25 Adam Fedor <fedor@gnu.org>
* Documentation/README.Darwin: Update.

10
Instance/framework.make
View file

@ -332,12 +332,12 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES_DIR) $(OBJ_FILES_TO_LINK) GNUmakefile
classarray="$$classarray)"; \
fi; \
echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \
if [ "`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_USER_ROOT))//'`" != "$(FRAMEWORK_INSTALL_DIR)" ]; then \
fw_env="@\"GNUSTEP_USER_ROOT\""; \
elif [ "`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_LOCAL_ROOT))//'`" != "$(FRAMEWORK_INSTALL_DIR)" ]; then \
fw_env="@\"GNUSTEP_LOCAL_ROOT\""; \
elif [ "`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_SYSTEM_ROOT))//'`" != "$(FRAMEWORK_INSTALL_DIR)" ]; then \
if [ "$(findstring $(GNUSTEP_SYSTEM_ROOT), $(FRAMEWORK_INSTALL_DIR))" = $(GNUSTEP_SYSTEM_ROOT) ]; then \
fw_env="@\"GNUSTEP_SYSTEM_ROOT\""; \
elif [ "$(findstring $(GNUSTEP_LOCAL_ROOT), $(FRAMEWORK_INSTALL_DIR))" = $(GNUSTEP_LOCAL_ROOT) ]; then \
fw_env="@\"GNUSTEP_LOCAL_ROOT\""; \
elif [ "$(findstring $(GNUSTEP_USER_ROOT), $(FRAMEWORK_INSTALL_DIR))" = $(GNUSTEP_USER_ROOT) ]; then \
fw_env="@\"GNUSTEP_USER_ROOT\""; \
else \
fw_env="nil"; \
fi; \