Skip to content

Commit

Permalink
Fixed bug when installing documentation with no makeinfo available, a…
Browse files Browse the repository at this point in the history
…nd messages=yes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@32804 72102866-910b-0410-8b05-ffd578937521
  • Loading branch information
nicola committed Apr 8, 2011
1 parent 567505c commit 9741f65
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2011-04-08 Nicola Pero <[email protected]>

* 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
<[email protected]>.

2011-04-04 Richard Frith-Macdonald <[email protected]>

* configure.ac:
Expand Down
2 changes: 1 addition & 1 deletion Instance/Documentation/texi.make
Original file line number Diff line number Diff line change
Expand Up @@ -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_::
Expand Down
7 changes: 5 additions & 2 deletions messages.make
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...

Expand All @@ -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)...";
Expand Down Expand Up @@ -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 =
Expand Down

0 comments on commit 9741f65

Please sign in to comment.