More backslash support.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@22116 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-11-28 21:07:45 +00:00
parent 7197cfdf0f
commit a0bc1baea8
2 changed files with 8 additions and 6 deletions

View file

@ -4,6 +4,8 @@
paths.
* GNUstep.csh.in: ditto
* GNUstep.sh.in: ditto
*GNUmakefile.in: Quote paths when we use them .. to avoid backslashes
being removed when they should be present in the path.
* configure.ac: Always make GNUSTEP_MAKEFILES the Library/Makefiles
subdirectory of the sytem root. Create new variables containing
escaped backslashes to handle being given a backslash in a path.

View file

@ -123,13 +123,13 @@ endif
move_obsolete:
$(EC)(echo "Moving paths from old heirarchy: "; \
$(srcdir)/move_obsolete_paths.sh $(GNUSTEP_SYSTEM_ROOT) $(GNUSTEP_LOCAL_ROOT) $(GNUSTEP_USER_ROOT))
$(srcdir)/move_obsolete_paths.sh "$(GNUSTEP_SYSTEM_ROOT)" "$(GNUSTEP_LOCAL_ROOT)" "$(GNUSTEP_USER_ROOT)")
install: all @GNUSTEP_MOVE_OBSOLETE@
$(EC)(echo "Creating system domain: $(GNUSTEP_SYSTEM_ROOT)"; \
$(srcdir)/create_domain_dir_tree.sh $(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);\
$(srcdir)/mkinstalldirs "$(GNUSTEP_LOCAL_ROOT)" "$(GNUSTEP_NETWORK_ROOT)";\
echo "Creating makefile directories in: $(makedir)"; \
$(srcdir)/mkinstalldirs \
$(makedir) \
@ -142,9 +142,9 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
$(makedir)/Instance/Shared \
$(makedir)/Instance/Documentation)
$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
$(srcdir)/mkinstalldirs $(GNUSTEP_CONFIG_FILE_DIR); \
$(INSTALL_DATA) GNUstep.conf $(GNUSTEP_CONFIG_FILE))
-$(EC) rm -f $(GNUSTEP_SYSTEM_ROOT)/Makefiles
$(srcdir)/mkinstalldirs "$(GNUSTEP_CONFIG_FILE_DIR)"; \
$(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
-$(EC) rm -f "$(GNUSTEP_SYSTEM_ROOT)/Makefiles"
$(EC)(echo "Installing gnustep-make support software"; \
$(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \
$(makedir)/$(GNUSTEP_TARGET_DIR))