Changeset 2271 for branches/0.6-stable/doc/Makefile.am

Timestamp:

Jun 14, 2010, 6:57:06 AM (13 years ago)

Author:

Peter

Message:

backporting r2266 to stable branch. Use echo instead of variable ECHO provided by libtool because it's broken with 2.2.8

File:

• branches/0.6-stable/doc/Makefile.am (modified) (4 diffs)

branches/0.6-stable/doc/Makefile.am

@@ -79 +79 @@
 
 $(DX_HTML_OUTPUT)/index.html: $(DOXYGEN_DEPS)
-  @(cat doxygen.config && $(ECHO) "INPUT = $(DOXYGEN_INPUT)" && \
-  $(ECHO) GENERATE_HTML = YES) | $(DOXYGEN) -;
+  @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
+  echo GENERATE_HTML = YES) | $(DOXYGEN) -;
 
 $(DX_LATEX_OUTPUT)/refman.tex: $(DOXYGEN_DEPS)
-  @(cat doxygen.config && $(ECHO) "INPUT = $(DOXYGEN_INPUT)" && \
-  $(ECHO) GENERATE_LATEX = YES) | $(DOXYGEN) -;
+  @(cat doxygen.config && echo "INPUT = $(DOXYGEN_INPUT)" && \
+  echo GENERATE_LATEX = YES) | $(DOXYGEN) -;
 
 $(PACKAGE).dvi: $(DX_LATEX_OUTPUT)/refman.tex
@@ -132 +132 @@
     test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)";\
     $(INSTALL_DATA) $(PACKAGE).dvi "$(DESTDIR)$(dvidir)/$(PACKAGE).dvi"; \
-    $(ECHO) "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\
+    echo "$(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)$(dvidir)/$(PACKAGE).dvi";\
   fi
 
@@ -139 +139 @@
     test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)";\
     $(INSTALL_DATA) $(PACKAGE).ps "$(DESTDIR)$(psdir)/$(PACKAGE).ps"; \
-    $(ECHO) "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\
+    echo "$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir)/$(PACKAGE).ps";\
   fi
 
@@ -146 +146 @@
     test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)";\
     $(INSTALL_DATA) $(PACKAGE).pdf "$(DESTDIR)$(pdfdir)/$(PACKAGE).pdf"; \
-    $(ECHO) "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\
+    echo "$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir)/$(PACKAGE).pdf";\
   fi