Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix missing man-page generation when building from darcs tree. Also simplifys doc generation a small bit.

Browse source 
darcs-hash:20061120135336-ac50b-d3b7a4ce2ac6bcc307c57cfcd23db86a8ac411a8.gz
This commit is contained in:
axel 2006-11-20 23:53:36 +10:00
parent f7435559a7
commit c2e1d76400
3 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc_src/Doxyfile.in → Doxyfile.help.in
View file

@ -30,7 +30,7 @@ PROJECT_NUMBER = @PACKAGE_VERSION@
# If a relative path is entered, it will be relative to the location # If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used. # where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = builtin_doc OUTPUT_DIRECTORY = help_doc
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output # 4096 sub-directories (in 2 levels) under the output directory of each output
@ -423,7 +423,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # with spaces.
INPUT = INPUT = doc_src
# If the value of the INPUT tag contains directories, you can use the # If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp

49
Makefile.in
View file

@ -160,9 +160,8 @@ TEST_IN := $(wildcard tests/test*.in)
# Files in ./doc_src/ # Files in ./doc_src/
# #
DOC_SRC_DIR_FILES := doc_src/Doxyfile.in doc_src/index.hdr \ DOC_SRC_DIR_FILES := doc_src/index.hdr doc_src/license.hdr \
doc_src/license.hdr doc_src/faq.hdr doc_src/design.hdr \ doc_src/faq.hdr doc_src/design.hdr $(DOC_SRC)
$(DOC_SRC)
# #
@ -171,14 +170,13 @@ DOC_SRC_DIR_FILES := doc_src/Doxyfile.in doc_src/index.hdr \
# are specified more than once. # are specified more than once.
# #
MAIN_DIR_FILES := Doxyfile Doxyfile.user Makefile.in configure \ MAIN_DIR_FILES := Doxyfile Doxyfile.user Doxyfile.help.in Makefile.in \
configure.ac config.h.in install-sh set_color.c count.c \ configure configure.ac config.h.in install-sh set_color.c count.c \
key_reader.c $(MIME_OBJS:.o=.h) \ key_reader.c $(MIME_OBJS:.o=.h) $(MIME_OBJS:.o=.c) \
$(MIME_OBJS:.o=.c) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) \ $(FISH_OBJS:.o=.h) $(BUILTIN_FILES) $(COMMON_FILES) \
$(COMMON_FILES) $(COMMON_FILES:.c=.h) $(FISH_OBJS:.o=.c) \ $(COMMON_FILES:.c=.h) $(FISH_OBJS:.o=.c) fish.spec.in INSTALL \
fish.spec.in INSTALL README user_doc.head.html \ README user_doc.head.html xsel-0.9.6.tar ChangeLog config.sub \
xsel-0.9.6.tar ChangeLog config.sub config.guess fish_tests.c \ config.guess fish_tests.c main.c fish_pager.c fishd.c seq.in
main.c fish_pager.c fishd.c seq.in
# #
@ -228,12 +226,9 @@ PROGRAMS:=fish set_color @XSEL@ @SEQ_FALLBACK@ mimedb count fish_pager fishd
# Manual pagess to install # Manual pagess to install
# #
MANUALS:=doc_src/builtin_doc/man/man1/fish.1 @XSEL_MAN_PATH@ \ MANUALS:=share/man/fish.1 @XSEL_MAN_PATH@ share/man/mimedb.1 \
doc_src/builtin_doc/man/man1/mimedb.1 \ share/man/set_color.1 share/man/count.1 share/man/fishd.1 \
doc_src/builtin_doc/man/man1/set_color.1 \ share/man/fish_pager.1
doc_src/builtin_doc/man/man1/count.1 \
doc_src/builtin_doc/man/man1/fishd.1 \
doc_src/builtin_doc/man/man1/fish_pager.1
# #
@ -248,7 +243,7 @@ TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
# Make everything needed for installing fish # Make everything needed for installing fish
# #
all: $(PROGRAMS) user_doc etc/config.fish share/config.fish share/config_interactive.fish $(TRANSLATIONS) all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish share/config_interactive.fish $(TRANSLATIONS)
@echo fish has now been built. @echo fish has now been built.
@echo Use \'make install\' to install fish. @echo Use \'make install\' to install fish.
.PHONY: all .PHONY: all
@ -461,20 +456,23 @@ common.o: $(COMMON_FILES)
# There ought to be something simpler. # There ought to be something simpler.
# #
doc_src/builtin_doc: $(DOC_SRC) doc_src/count.txt share/man: $(DOC_SRC) doc_src/count.txt
for i in $(DOC_SRC); do \ for i in $(DOC_SRC); do \
FILE=doc_src/`basename $$i .txt`.doxygen; \ FILE=doc_src/`basename $$i .txt`.doxygen; \
echo "/** \page" `basename $$i .txt` >$$FILE; \ echo "/** \page" `basename $$i .txt` >$$FILE; \
cat $$i >>$$FILE; \ cat $$i >>$$FILE; \
echo "*/" >>$$FILE; \ echo "*/" >>$$FILE; \
done done
cd doc_src; doxygen; cd ..; doxygen Doxyfile.help
for i in doc_src/builtin_doc/man/man1/*.1; do \ for i in help_doc/man/man1/*.1; do \
CMD_NAME=`basename $$i .1`; \ CMD_NAME=`basename $$i .1`; \
sed -e "s/\(.\)\\.SH/\1/" -e "s/$$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" <$$i >$$i.tmp; \ sed -e "s/\(.\)\\.SH/\1/" -e "s/$$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" <$$i >$$i.tmp; \
mv $$i.tmp $$i; \ mv $$i.tmp $$i; \
done done
touch doc_src/builtin_doc -mkdir share/man
cp help_doc/man/man1/*.1 share/man
touch share/man
# #
# The build rules for installing/uninstalling fish # The build rules for installing/uninstalling fish
@ -745,7 +743,7 @@ depend:
# exists # 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 doc_src/builtin_doc 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@ rm -rf fish-@PACKAGE_VERSION@
$(INSTALL) -d fish-@PACKAGE_VERSION@ $(INSTALL) -d fish-@PACKAGE_VERSION@
$(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src $(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src
@ -765,9 +763,8 @@ fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(ETC_DIR_FIL
cp -f $(FUNCTIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/functions/ cp -f $(FUNCTIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/functions/
cp -f $(TESTS_DIR_FILES) fish-@PACKAGE_VERSION@/tests/ cp -f $(TESTS_DIR_FILES) fish-@PACKAGE_VERSION@/tests/
cp -f $(TRANSLATIONS_SRC) fish-@PACKAGE_VERSION@/po/ cp -f $(TRANSLATIONS_SRC) fish-@PACKAGE_VERSION@/po/
cp -f doc_src/builtin_doc/man/man1/*.1 fish-@PACKAGE_VERSION@/share/man/ cp -f share/man/*.1 fish-@PACKAGE_VERSION@/share/man/
cp -rf user_doc fish-@PACKAGE_VERSION@/ cp -rf user_doc fish-@PACKAGE_VERSION@/
cp -rf doc_src/builtin_doc fish-@PACKAGE_VERSION@/doc_src/
tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar
rm -rf fish-@PACKAGE_VERSION@ rm -rf fish-@PACKAGE_VERSION@
@ -830,7 +827,7 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec
# #
distclean: clean distclean: clean
rm -f fish.spec doc_src/Doxyfile rm -f fish.spec Doxyfile.help
rm -f etc/config.fish share/config_interactive.fish seq share/config.fish rm -f etc/config.fish share/config_interactive.fish seq share/config.fish
rm -f config.status config.log config.h Makefile rm -f config.status config.log config.h Makefile
.PHONY: distclean .PHONY: distclean

2
configure.ac
View file

@ -776,7 +776,7 @@ case $target_os in
esac esac
# Tell the world what we know # Tell the world what we know
AC_CONFIG_FILES([Makefile fish.spec doc_src/Doxyfile seq]) AC_CONFIG_FILES([Makefile fish.spec Doxyfile.help seq])
AC_OUTPUT AC_OUTPUT
if test ! x$local_found_posix_switch = xyes; then if test ! x$local_found_posix_switch = xyes; then