[Xfce4-commits] <xfce4-docs:ristretto-master> Fix Makefile.am

Stephan Arts noreply at xfce.org
Thu Oct 27 17:42:01 CEST 2011


Updating branch refs/heads/ristretto-master
         to acbdff5c43ba7228322f31a19a2b27f6463bd09d (commit)
       from 3441f9b259a91b42b4eacf6c066931f80219ed8f (commit)

commit acbdff5c43ba7228322f31a19a2b27f6463bd09d
Author: Stephan Arts <stephan at xfce.org>
Date:   Thu Oct 27 17:39:21 2011 +0200

    Fix Makefile.am

 manual/Makefile.am |  168 ++++++++++++++++++++++++----------------------------
 1 files changed, 77 insertions(+), 91 deletions(-)

diff --git a/manual/Makefile.am b/manual/Makefile.am
index ae59756..be26369 100644
--- a/manual/Makefile.am
+++ b/manual/Makefile.am
@@ -5,126 +5,112 @@ MALLARD_CSS = index.css
 MALLARD_XSL = index.xsl
 
 TARGET_DIR = $(DESTDIR)$(docdir)/html
-LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po 2> /dev/null |
-sed 's,[.]po,,g'`)
+LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po 2> /dev/null | sed 's,[.]po,,g'`)
 
 EXTRA_DIST = $(MALLARD_PAGE) $(MALLARD_CSS) $(MALLARD_XSL)
 CLEANFILES = doc-build.stamp
 
 install-data-local:
-    echo "*** Installing HTML documentation"; \
-    if test -d "$(srcdir)/html"; then \
-        echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
-        $(mkinstalldirs) $(TARGET_DIR); \
-        $(INSTALL_DATA) $(srcdir)/html/$(MALLARD_CSS) $(TARGET_DIR); \
-        for lang in C $(LINGUAS); do \
-            echo "--- $(TARGET_DIR)/$$lang/"; \
-            if test -d "$(srcdir)/html/$$lang"; then \
-                $(mkinstalldirs) $(TARGET_DIR)/$$lang; \
-                $(INSTALL_DATA) $(srcdir)/html/$$lang/index.html
-$(TARGET_DIR)/$$lang; \
-            fi; \
-            if test ! -d "$(TARGET_DIR)/$$lang/media" -o -L
-"$(TARGET_DIR)/$$lang/media"; then \
-                if test -L "$(TARGET_DIR)/$$lang/media"; then \
-                    rm -f $(TARGET_DIR)/$$lang/media; \
-                fi; \
-                $(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \
-            fi; \
-        done; \
-    else \
-        echo "--- Nothing to install into $(TARGET_DIR)"; \
-    fi
+	echo "*** Installing HTML documentation"; \
+	if test -d "$(srcdir)/html"; then \
+		echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
+		$(mkinstalldirs) $(TARGET_DIR); \
+		$(INSTALL_DATA) $(srcdir)/html/$(MALLARD_CSS) $(TARGET_DIR); \
+		for lang in C $(LINGUAS); do \
+			echo "--- $(TARGET_DIR)/$$lang/"; \
+			if test -d "$(srcdir)/html/$$lang"; then \
+				$(mkinstalldirs) $(TARGET_DIR)/$$lang; \
+				$(INSTALL_DATA) $(srcdir)/html/$$lang/index.html $(TARGET_DIR)/$$lang; \
+			fi; \
+			if test ! -d "$(TARGET_DIR)/$$lang/media" -o -L "$(TARGET_DIR)/$$lang/media"; then \
+				if test -L "$(TARGET_DIR)/$$lang/media"; then \
+					rm -f $(TARGET_DIR)/$$lang/media; \
+				fi; \
+				$(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \
+			fi; \
+		done; \
+	else \
+		echo "--- Nothing to install into $(TARGET_DIR)"; \
+	fi
 
 uninstall-local:
-    echo "*** Uninstalling HTML documentation"; \
-    echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
-    rm -f $(TARGET_DIR)/$(MALLARD_CSS); \
-    for lang in C $(LINGUAS); do \
-        echo "--- $(TARGET_DIR)/$$lang/"; \
-        rm -f $(TARGET_DIR)/$$lang/index.html; \
-        if test -L $(TARGET_DIR)/$$lang/media; then \
-            rm -f $(TARGET_DIR)/$$lang/media; \
-        fi; \
-    done
+	echo "*** Uninstalling HTML documentation"; \
+	echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
+	rm -f $(TARGET_DIR)/$(MALLARD_CSS); \
+	for lang in C $(LINGUAS); do \
+		echo "--- $(TARGET_DIR)/$$lang/"; \
+		rm -f $(TARGET_DIR)/$$lang/index.html; \
+		if test -L $(TARGET_DIR)/$$lang/media; then \
+			rm -f $(TARGET_DIR)/$$lang/media; \
+		fi; \
+	done
 
 clean-local:
-    rm -rf "$(srcdir)/html"
+	rm -rf "$(srcdir)/html"
 
 if GENERATE_DOCUMENTATION
 
 update-po:
-    rm -f "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"
-    $(ITSTOOL) -o "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" $(MALLARD_PAGE)
-    for lang in $(LINGUAS); do \
-        echo -n "$$lang.po... "; \
-        $(MSGMERGE) --backup=none -U "$(srcdir)/po/$$lang.po"
-"$(srcdir)/po/$(GETTEXT_PACKAGE).pot"; \
-    done
+	rm -f "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"
+	$(ITSTOOL) -o "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" $(MALLARD_PAGE)
+	for lang in $(LINGUAS); do \
+		echo -n "$$lang.po... "; \
+		$(MSGMERGE) --backup=none -U "$(srcdir)/po/$$lang.po" "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"; \
+	done
 
 doc-build.stamp: $(MALLARD_CSS) $(MALLARD_XSL)
-    @-chmod -R u+w "$(srcdir)"
-    rm -rf "$(srcdir)/html"
-    @echo "*** Building HTML documentation"
-    @echo "--- Generating C documentation"
-    $(GNOME_DOC_TOOL) html -o "$(srcdir)/html/C/" -x
-"$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)"
-"$(srcdir)/$(MALLARD_PAGE)"
-    cp "$(srcdir)/$(MALLARD_CSS)" "$(srcdir)/html"
-    @rm "$(srcdir)/html/C/index.cache"
-    for lang in $(LINGUAS); do \
-        echo "--- Generating $$lang documentation"; \
-        mkdir -p "$(srcdir)/tmp"; \
-        $(MSGFMT) -o "$(srcdir)/tmp/$$lang.mo" "$(srcdir)/po/$$lang.po";
-\
-        $(ITSTOOL) -l "$$lang" -m "$(srcdir)/tmp/$$lang.mo" -o
-"$(srcdir)/tmp/index.page" "$(srcdir)/$(MALLARD_PAGE)"; \
-        $(GNOME_DOC_TOOL) html -n -o "$(srcdir)/html/$$lang/" -x
-"$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)"
-"$(srcdir)/tmp/index.page"; \
-        chmod -R u+w "$(srcdir)/html/$$lang"; \
-        rm -rf "$(srcdir)/tmp" "$(srcdir)/html/$$lang/index.cache"; \
-    done
-    touch doc-build.stamp
+	@-chmod -R u+w "$(srcdir)"
+	rm -rf "$(srcdir)/html"
+	@echo "*** Building HTML documentation"
+	@echo "--- Generating C documentation"
+	$(GNOME_DOC_TOOL) html -o "$(srcdir)/html/C/" -x "$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/$(MALLARD_PAGE)"
+	cp "$(srcdir)/$(MALLARD_CSS)" "$(srcdir)/html"
+	@rm "$(srcdir)/html/C/index.cache"
+	for lang in $(LINGUAS); do \
+		echo "--- Generating $$lang documentation"; \
+		mkdir -p "$(srcdir)/tmp"; \
+		$(MSGFMT) -o "$(srcdir)/tmp/$$lang.mo" "$(srcdir)/po/$$lang.po"; \
+		$(ITSTOOL) -l "$$lang" -m "$(srcdir)/tmp/$$lang.mo" -o "$(srcdir)/tmp/index.page" "$(srcdir)/$(MALLARD_PAGE)"; \
+		$(GNOME_DOC_TOOL) html -n -o "$(srcdir)/html/$$lang/" -x "$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/tmp/index.page"; \
+		chmod -R u+w "$(srcdir)/html/$$lang"; \
+		rm -rf "$(srcdir)/tmp" "$(srcdir)/html/$$lang/index.cache"; \
+	done
+	touch doc-build.stamp
 
 dist-check-doc: all
 
 else
 
 update-po:
-    @echo "*** You need to compile with --enable-gen-doc in order to run
-make update-po"
-    @false
+	@echo "*** You need to compile with --enable-gen-doc in order to run make update-po"
+	@false
 
 doc-build.stamp:
-    @if test ! -d "$(srcdir)/html"; then \
-        echo; \
-        echo "*** No generated documenation found. If you want to "; \
-        echo "*** generate the (translated) documentation, run
-configure"; \
-        echo "*** with --enable-gen-doc."; \
-        echo; \
-    fi
+	@if test ! -d "$(srcdir)/html"; then \
+		echo; \
+		echo "*** No generated documenation found. If you want to "; \
+		echo "*** generate the (translated) documentation, run configure"; \
+		echo "*** with --enable-gen-doc."; \
+		echo; \
+	fi
 
 dist-check-doc:
-    @echo "*** You need to compile with --enable-gen-doc in order to run
-make dist"
-    @false
+	@echo "*** You need to compile with --enable-gen-doc in order to run make dist"
+	@false
 
 endif
 
 all: doc-build.stamp
 
 dist-hook: dist-check-doc doc-build.stamp
-    mkdir -p "$(distdir)/html"; \
-    if test -f "$(srcdir)/html/$(MALLARD_CSS)"; then \
-        cp "$(srcdir)/html/$(MALLARD_CSS)" "$(distdir)/html"; \
-    fi; \
-    for lang in C $(LINGUAS); do \
-        if test -f "$(srcdir)/html/$$lang/index.html"; then \
-            mkdir -p "$(distdir)/html/$$lang"; \
-            cp -t "$(distdir)/html/$$lang/" $(srcdir)/html/$$lang/*; \
-        fi; \
-    done
-
+	mkdir -p "$(distdir)/html"; \
+	if test -f "$(srcdir)/html/$(MALLARD_CSS)"; then \
+		cp "$(srcdir)/html/$(MALLARD_CSS)" "$(distdir)/html"; \
+	fi; \
+	for lang in C $(LINGUAS); do \
+		if test -f "$(srcdir)/html/$$lang/index.html"; then \
+			mkdir -p "$(distdir)/html/$$lang"; \
+			cp -t "$(distdir)/html/$$lang/" $(srcdir)/html/$$lang/*; \
+		fi; \
+	done
 


More information about the Xfce4-commits mailing list