Fixed cleaning texi targets. Moved textdoc targets to texi.make where they are used

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@28708 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2009-09-19 08:25:10 +00:00
parent 4f47d8c4df
commit 450269751b
3 changed files with 29 additions and 18 deletions

View file

@ -1,3 +1,11 @@
2009-09-19 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/documentation.make: Moved internal-textdoc-install_,
internal-textdoc-uninstall_, internal-textdoc-clean,
internal-textdoc-distclean to Instance/Documentation/texi.make.
* Instance/Documentation/texi.make (internal-doc-clean): Remove
the GNUSTEP_INSTANCE directory if empty.
2009-09-19 Nicola Pero <nicola.pero@meta-innovation.com>
* Documentation/gnustep.init: Terminate the file with '1;', as

View file

@ -117,6 +117,7 @@ internal-doc-clean::
$(GNUSTEP_INSTANCE).ps.gz \
$(GNUSTEP_INSTANCE).tar.gz \
$(GNUSTEP_INSTANCE)/*$(END_ECHO)
-$(ECHO_NOTHING) rmdir $(GNUSTEP_INSTANCE) $(END_ECHO)
# NB: Only install doc files if they have been generated
@ -154,3 +155,19 @@ internal-doc-uninstall_::
rm -f \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).html
#
# textdoc targets - these should be merged with the doc targets
#
internal-textdoc-install_:: $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)
$(ECHO_NOTHING)$(INSTALL_DATA) $(GNUSTEP_INSTANCE) \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)$(END_ECHO)
internal-textdoc-uninstall_::
$(ECHO_UNINSTALLING)rm -f \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
internal-textdoc-clean::
$(ECHO_NOTHING) rm -f $(GNUSTEP_INSTANCE) $(END_ECHO)
internal-textdoc-distclean::

View file

@ -27,6 +27,10 @@ endif
# NB: Parallel building is not supported here (yet?).
#
# TODO: Remove DOCUMENT_TEXT_NAME and use only DOCUMENT_NAME. DOCUMENT_TEXT_NAME
# is only used by texi.make.
#
# The names of the documents are in the DOCUMENT_NAME variable.
# These final documents will be generated in info, dvi, ps, and html output.
#
@ -136,21 +140,3 @@ endif
ifneq ($($(GNUSTEP_INSTANCE)_INSTALL_FILES),)
include $(GNUSTEP_MAKEFILES)/Instance/Documentation/install_files.make
endif
#
# textdoc targets - these are meant to be used with texi.make ... maybe
# they should be moved in there
#
internal-textdoc-install_:: $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)
$(ECHO_NOTHING)$(INSTALL_DATA) $(GNUSTEP_INSTANCE) \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)$(END_ECHO)
internal-textdoc-uninstall_::
$(ECHO_UNINSTALLING)rm -f \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)$(END_ECHO)
internal-textdoc-clean::
$(ECHO_NOTHING) rm -f $(GNUSTEP_INSTANCE) $(END_ECHO)
internal-textdoc-distclean::