Large set of changes related to making fish relocatable, and improving the build and install story.

- etc/config.fish and share/config.fish are now "universal" and no longer reference install paths or need to be touched by autotools. They've been removed from config.fish.in to config.fish.
- fish now attempts to determine __fish_datadir and __fish_sysconfdir relative to the path of the fish executable itself (typically by walking up one directory). This means that you can copy the directory hierarchy around and things will still work. The compiled-in paths are used as a backup.
- The fish Xcode project now can build fish natively, without needing autotools.
- Version bumped to 2.0

1 files changed, 11 insertions, 75 deletions

diff --git a/Makefile.in b/Makefile.in
index b70dd621..d76ad119 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,6 @@ mandir = @mandir@
 sysconfdir = @sysconfdir@
 docdir = @docdir@
 localedir = @localedir@
-prefix = @prefix@
 optbindirs = @optbindirs@
 
 #
@@ -226,20 +225,6 @@ MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED))
 
 
 #
-# Files in ./etc/
-#
-
-ETC_DIR_FILES :=etc/config.fish.in
-
-
-#
-# Files in ./share/
-#
-
-SHARE_DIR_FILES :=share/config.fish.in
-
-
-#
 # Files in ./tests/
 #
 
@@ -296,7 +281,7 @@ XSEL_BIN := @XSEL_BIN@
 # Make everything needed for installing fish
 #
 
-all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish $(TRANSLATIONS)
+all: $(PROGRAMS) user_doc share/man $(TRANSLATIONS)
 	@echo fish has now been built.
 	@echo Use \'$(MAKE) install\' to install fish.
 .PHONY: all
@@ -319,12 +304,9 @@ Makefile: Makefile.in configure
 # and should only be used when debuging fish.
 #
 
-debug:
-	$(MAKE) fish EXTRA_CXXFLAGS="-O0 -Wno-unused -g"
-.PHONY: debug
-
-prof:
-	$(MAKE) all EXTRA_CXXFLAGS="-pg" LDFLAGS="-pg"
+prof: EXTRA_CXXFLAGS += -pg
+prof: LDFLAGS += -pg
+prof: all
 .PHONY: prof
 
 #
@@ -335,8 +317,7 @@ prof:
 # intermediate *.hdr and doc.h files if needed
 # Allow doxygen to fail, e.g. if it does not exist
 
-user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC)
-	$(MAKE) doc.h $(HDR_FILES)
+user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) doc.h $(HDR_FILES)
 	- doxygen Doxyfile.user && touch user_doc
 
 
@@ -471,10 +452,10 @@ doc.h: $(HDR_FILES)
 # Create a template translation object
 #
 
-messages.pot: *.cpp *.h etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq
+messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish seq
 	if test $(HAVE_GETTEXT) = 1;then \
 		xgettext -k_ -kN_ *.cpp *.h -o messages.pot; \
-		if xgettext -j -k_ -kN_ -k--description -LShell etc/*.in share/*.in share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
+		if xgettext -j -k_ -kN_ -k--description -LShell share/completions/*.fish share/functions/*.fish seq -o messages.pot; then true; else \
 			echo "Your xgettext version is too old to build the messages.pot file"\
 			rm messages.pot\
 			false;\
@@ -669,16 +650,15 @@ uninstall: uninstall-translations
 		rm -f $(DESTDIR)$(bindir)/$$i; \
 	done;
 	-rm -f $(DESTDIR)$(bindir)/xsel
-	-rm -f $(DESTDIR)$(sysconfdir)/fish/config.fish
-	-rmdir $(DESTDIR)$(sysconfdir)/fish
+	-rm -rf $(DESTDIR)$(sysconfdir)/fish
 	-if test -d $(DESTDIR)$(datadir)/fish; then \
 		rm -r $(DESTDIR)$(datadir)/fish; \
 	fi
 	-if test -d $(DESTDIR)$(docdir); then \
-		rm -r $(DESTDIR)$(docdir);\
+		rm -rf $(DESTDIR)$(docdir);\
 	fi
 	-for i in $(MANUALS); do \
-		rm -f $(DESTDIR)$(mandir)/man1/`basename $$i`*; \
+		rm -rf $(DESTDIR)$(mandir)/man1/`basename $$i`*; \
 	done;
 .PHONY: uninstall
 
@@ -821,49 +801,6 @@ depend:
 autoload.cpp function.cpp: $(GENERATED_INTERN_SCRIPT_FILES)
 
 #
-# Copy all the source files into a new directory and use tar to create
-# an archive from it. Simplest way I could think of to make an archive
-# witout backups, autogenerated files, etc.
-#
-# Uses install instead of mkdir so build won't fail if the directory
-# exists
-#
-
-fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(ETC_DIR_FILES) $(TEST_DIR_FILES) $(SHARE_DIR_FILES) $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog user_doc share/man
-	rm -rf fish-@PACKAGE_VERSION@
-	$(INSTALL) -d fish-@PACKAGE_VERSION@
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/user_doc
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/etc
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/completions
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/functions
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/man
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/tests
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/po
-	cp -f $(DOC_SRC_DIR_FILES) fish-@PACKAGE_VERSION@/doc_src
-	cp -f $(MAIN_DIR_FILES) fish-@PACKAGE_VERSION@/
-	cp -f $(ETC_DIR_FILES) fish-@PACKAGE_VERSION@/etc/
-	cp -f $(SHARE_DIR_FILES) fish-@PACKAGE_VERSION@/share/
-	cp -f $(COMPLETIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/completions/
-	cp -f $(FUNCTIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/functions/
-	cp -f $(TESTS_DIR_FILES) fish-@PACKAGE_VERSION@/tests/
-	cp -f $(TRANSLATIONS_SRC) fish-@PACKAGE_VERSION@/po/
-	cp -f share/man/*.1 fish-@PACKAGE_VERSION@/share/man/
-	cp -rf user_doc fish-@PACKAGE_VERSION@/
-	tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar
-	rm -rf fish-@PACKAGE_VERSION@
-
-
-#
-# Just an alias for fish-@PACKAGE_VERSION@.tar
-#
-
-tar: fish-@PACKAGE_VERSION@.tar
-.PHONY: tar
-
-
-#
 # Make compressed tar archives
 #
 
@@ -915,7 +852,6 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec
 
 distclean: clean
 	rm -f fish.spec Doxyfile.help
-	rm -f etc/config.fish seq share/config.fish
 	rm -f config.status config.log config.h Makefile
 	rm -rf $(XSEL)
 .PHONY: distclean
@@ -932,7 +868,7 @@ clean:
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
 	rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader
 	rm -f command_list.txt toc.txt
-	rm -f share/config.fish etc/config.fish doc_src/index.hdr doc_src/commands.hdr
+	rm -f doc_src/index.hdr doc_src/commands.hdr
 	rm -f fish-@PACKAGE_VERSION@.tar
 	rm -f fish-@PACKAGE_VERSION@.tar.gz
 	rm -f fish-@PACKAGE_VERSION@.tar.bz2