From 3978de2cde12867eb19a736a61ad81254c440b64 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 30 Nov 2013 15:11:05 +0800
Subject: autoconf build: clean up Makefile, remove fish.spec

Removes some unused variables and out-of-date references.
Wraps some tests in quotes to avoid expansion errors.
Removes the fish.spec generated file as it is out of date and is
arguably better maintained by downstream packagers.
See http://github.com/zanchey/fish-build/ for a better RPM spec file.
---
 Makefile.in | 67 +++++--------------------------------------------------------
 1 file changed, 5 insertions(+), 62 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 2b161607..6a336f74 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,14 +20,7 @@
 
 #
 # Makefile for the fish shell. Can build fish and associated
-# applications, install them, recalculate dependencies and also create
-# binary distributions in tar.bz2, tar.gz and rpm formats.
-#
-
-#
-# The fish buildprocess is quite complex. Do not stare directly into
-# the Makefile. Doing so may cause nausea, dizziness and
-# hallucinations.
+# applications, install them, and recalculate dependencies.
 #
 
 # Used by docdir
@@ -186,48 +179,6 @@ HELP_SRC := $(wildcard doc_src/*.txt)
 
 TEST_IN := $(wildcard tests/test*.in)
 
-
-#
-# Files that should be added to the tar archives
-#
-
-#
-# Files in ./doc_src/
-#
-
-DOC_SRC_DIR_FILES := $(HDR_FILES_SRC) $(HELP_SRC)
-
-
-#
-# Files in ./
-#
-
-MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help					\
-    Makefile.in configure configure.ac config.h.in install-sh					\
-    key_reader.cpp $(MIME_OBJS:.o=.h)											\
-    $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES)					\
-    $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp)				\
-    fish.spec.in INSTALL README user_doc.head.html								\
-    ChangeLog config.sub config.guess fish_tests.cpp fish.cpp fish_pager.cpp	\
-    fishd.cpp make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.cpp)
-
-#
-# The sorting is not meaningful in itself, but it has the side effect
-# of removing duplicates, which means there will be fewer warnings
-# during building.
-#
-
-MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED))
-
-
-#
-# Files in ./tests/
-#
-
-TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\
-	$(TEST_IN:.in=.status) tests/test.fish tests/gen_output.fish
-
-
 #
 # Files in ./share/completions/
 #
@@ -449,7 +400,7 @@ doc.h: $(HDR_FILES)
 #
 
 %.po:messages.pot
-	if test $(HAVE_GETTEXT) = 1;then \
+	if test "$(HAVE_GETTEXT)" = 1;then \
 		if test -f $*.po; then \
 			msgmerge -U --backup=existing $*.po messages.pot;\
 		else \
@@ -463,7 +414,7 @@ doc.h: $(HDR_FILES)
 #
 
 messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish
-	if test $(HAVE_GETTEXT) = 1;then \
+	if test "$(HAVE_GETTEXT)" = 1; then \
 		xgettext -k_ -kN_ *.cpp *.h -o messages.pot; \
 		if xgettext -j -k_ -kN_ -k--description -LShell share/completions/*.fish share/functions/*.fish -o messages.pot; then true; else \
 			echo "Your xgettext version is too old to build the messages.pot file"\
@@ -714,7 +665,7 @@ uninstall-legacy: uninstall
 .PHONY: uninstall-legacy
 
 install-translations: $(TRANSLATIONS)
-	if test $(HAVE_GETTEXT) = 1; then \
+	if test "$(HAVE_GETTEXT)" = 1; then \
 		for i in $(TRANSLATIONS); do \
 			$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES; \
 			$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo; \
@@ -724,7 +675,7 @@ install-translations: $(TRANSLATIONS)
 .PHONY: install-translations
 
 uninstall-translations:
-	if test $(HAVE_GETTEXT) = 1; then \
+	if test "$(HAVE_GETTEXT)" = 1; then \
 		for i in $(TRANSLATIONS_SRC); do \
 			rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \
 		done; \
@@ -800,13 +751,6 @@ depend:
 	./config.status
 .PHONY: depend
 
-#
-# Build the RPM spec file.
-#
-
-fish.spec: fish.spec.in
-	./config.status
-
 #
 # Cleanup targets
 #
@@ -816,7 +760,6 @@ fish.spec: fish.spec.in
 #
 
 distclean: clean
-	rm -f fish.spec
 	rm -f config.status config.log config.h Makefile
 .PHONY: distclean
 
-- 
cgit v1.2.3


From 2efc0bad1c414d5e74b9a43148daf8cba202a02b Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Sat, 30 Nov 2013 15:18:22 +0800
Subject: add correct version number to manpage output

---
 Makefile.in                        | 2 +-
 build_tools/build_documentation.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 6a336f74..6433eade 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -459,7 +459,7 @@ share/man: $(HELP_SRC)
 	-mkdir share/man
 	touch share/man
 	-rm -Rf share/man/man1
-	./build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share
+	PROJECT_NUMBER=`echo $(FISH_BUILD_VERSION)| sed "s/-.*//"` ./build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share
 
 #
 # The build rules for installing/uninstalling fish
diff --git a/build_tools/build_documentation.sh b/build_tools/build_documentation.sh
index 76c19a04..0c4a2aac 100755
--- a/build_tools/build_documentation.sh
+++ b/build_tools/build_documentation.sh
@@ -86,7 +86,7 @@ done
 # Input is kept as . because we cd to the input directory beforehand
 # This prevents doxygen from generating "documentation" for intermediate directories
 DOXYPARAMS=$(cat <<EOF
-PROJECT_NUMBER=2.0.0
+PROJECT_NUMBER=$PROJECT_NUMBER
 INPUT=.
 OUTPUT_DIRECTORY=$OUTPUTDIR
 QUIET=YES
-- 
cgit v1.2.3