gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not attempt to install texinfo documentation if it could not be built because of a missing makeinfo. Print a warning instead.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32652 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-03-18 23:30:35 +00:00
parent b1bf46c277
commit d1c754c69f
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2011-03-18 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/Documentation/texi.make (internal-textdoc-install_):
Only install GNUSTEP_INSTANCE if the file exists. If not, print
the message " Nothing to install because nothing was built
(usually because makeinfo is not available)" instead of aborting.
* messages.make (ALWAYS_ECHO_NO_LANGUAGES): New variable.
2011-03-18 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: By default, use --enable-absolute-install-paths on

9
Instance/Documentation/texi.make
View file

@ -158,9 +158,13 @@ internal-doc-uninstall_::
#
# textdoc targets - these should be merged with the doc targets
#
# Make sure we don't install only files that have been generated!
internal-textdoc-install_:: $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)
$(ECHO_NOTHING)$(INSTALL_DATA) $(GNUSTEP_INSTANCE) \
$(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)$(END_ECHO)
$(ECHO_NOTHING)if [ -f $(GNUSTEP_INSTANCE) ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE) $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
else \
$(INSIDE_ECHO_MISSING_DOCUMENTATION) \
fi$(END_ECHO)
internal-textdoc-uninstall_::
$(ECHO_UNINSTALLING)rm -f \
@ -170,4 +174,3 @@ internal-textdoc-clean::
$(ECHO_NOTHING) rm -f $(GNUSTEP_INSTANCE) $(END_ECHO)
internal-textdoc-distclean::

2
messages.make
View file

@ -38,6 +38,7 @@ ifneq ($(messages),yes)
# We use 'INSIDE_ECHO_' instead of 'ECHO_' to mark the difference.
INSIDE_ECHO_JAVA_COMPILING = echo "Compiling file $< ...";
INSIDE_ECHO_JAVA_BATCH_COMPILING = echo " Compiling Java files for $(GNUSTEP_INSTANCE) ...";
INSIDE_ECHO_MISSING_DOCUMENTATION = echo " Nothing to install because nothing was built (usually because makeinfo is not available)";
ECHO_LINKING = @(echo " Linking $(GNUSTEP_TYPE) $(GNUSTEP_INSTANCE) ...";
ECHO_JAVAHING = @(echo " Running javah on $< ...";
ECHO_INSTALLING = @(echo " Installing $(GNUSTEP_TYPE) $(GNUSTEP_INSTANCE)...";
@ -107,6 +108,7 @@ else
ECHO_COMPILING =
INSIDE_ECHO_JAVA_COMPILING =
INSIDE_ECHO_JAVA_BATCH_COMPILING =
INSIDE_ECHO_MISSING_DOCUMENTATION =
ECHO_LINKING =
ECHO_JAVAHING =
ECHO_INSTALLING =