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

Fixed bug when installing documentation with no makeinfo available, and messages=yes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32804 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2011-04-08 16:38:30 +00:00
parent cfb737fda4
commit e7a6070022
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2011-04-08 Nicola Pero <nicola.pero@meta-innovation.com>
* messages.make (INSIDE_ECHO_MISSING_DOCUMENTATION): Renamed to
ALWAYS_INSIDE_ECHO_MISSING_DOCUMENTATION, and moved it outside of
the if/else.
* Instance/Documentation/texi.make (internal-textdoc-install_):
Use ALWAYS_INSIDE_ECHO_MISSING_DOCUMENTATION instead of
INSIDE_ECHO_MISSING_DOCUMENTATION. This fixes the rule when
messages=yes. Issue reported by Sebastian Reitenbach
<buzzdee@web.de>.
2011-04-04 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac:

2
Instance/Documentation/texi.make
View file

@ -163,7 +163,7 @@ internal-textdoc-install_:: $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)
$(ECHO_NOTHING)if [ -f $(GNUSTEP_INSTANCE) ]; then \
$(INSTALL_DATA) $(GNUSTEP_INSTANCE) $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
else \
$(INSIDE_ECHO_MISSING_DOCUMENTATION) \
$(ALWAYS_INSIDE_ECHO_MISSING_DOCUMENTATION) \
fi$(END_ECHO)
internal-textdoc-uninstall_::

7
messages.make
View file

@ -25,6 +25,11 @@
ALWAYS_ECHO_NO_FILES = @(echo " No files specified ... nothing done.")
ALWAYS_ECHO_NO_LANGUAGES = @(echo " No LANGUAGES specified ... nothing done.")
# Instance/Documentation/texi.make. This is special because as it
# doesn't have the initial '@(' for technical reasons. We use
# 'INSIDE_ECHO_' instead of 'ECHO_' to mark the difference.
ALWAYS_INSIDE_ECHO_MISSING_DOCUMENTATION = echo " Nothing to install because nothing was built (usually because makeinfo is not available)";
# Eventual translation of the ALWAYS_ECHO_XXX messages should be done
# here ...
@ -38,7 +43,6 @@ 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)...";
@ -108,7 +112,6 @@ else
ECHO_COMPILING =
INSIDE_ECHO_JAVA_COMPILING =
INSIDE_ECHO_JAVA_BATCH_COMPILING =
INSIDE_ECHO_MISSING_DOCUMENTATION =
ECHO_LINKING =
ECHO_JAVAHING =
ECHO_INSTALLING =