From cf22a0036304e55671e10508e694eac33620af19 Mon Sep 17 00:00:00 2001
From: Richard Boulton <richard@tartarus.org>
Date: Sat, 30 Dec 2000 14:46:09 +0000
Subject: [PATCH] Fix a bug in manual/Makefile.am: bad shell script for make
 disting .ps files.   Couple of final fixes to libs/Makefil...

Original commit message from CVS:
Fix a bug in manual/Makefile.am: bad shell script for make disting .ps
files.   Couple of final fixes to libs/Makefile.am, too.
Add a few things to cvsignores.
---
 docs/libs/.gitignore    |  1 +
 docs/libs/Makefile.am   | 15 ++++++++-------
 docs/manual/.gitignore  |  1 +
 docs/manual/Makefile.am |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs/libs/.gitignore b/docs/libs/.gitignore
index b5548ac928..fce934253f 100644
--- a/docs/libs/.gitignore
+++ b/docs/libs/.gitignore
@@ -1,5 +1,6 @@
 Makefile
 Makefile.in
+tmpl
 html
 sgml
 gstreamer-libs-unused.txt
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 8c20dae618..0e4ba2560b 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -36,12 +36,14 @@ tmpl/$(DOC_MODULE)-unused.sgml: $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.tx
 sgml/$(DOC_MODULE)-doc.bottom: tmpl/$(DOC_MODULE)-unused.sgml
 	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
 
+all-local: html
+
 clean-local:
 	$(RM) -rf *~ *.bak *.signals *-unused.txt *.args tmpl html sgml tmpl/*.bak $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt 
 
 install-data-local: html
-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
+	@$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
+	@(installfiles=`echo $(srcdir)/html/*.html`; \
 	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
 	then echo '-- Nothing to install' ; \
 	else \
@@ -55,13 +57,12 @@ install-data-local: html
 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
 	fi)
 
+uninstall-local: html
+	@echo '-- Uninstalling '$(DESTDIR)$(TARGET_DIR) ; \
+	$(RM) -rf $(DESTDIR)$(TARGET_DIR)
+
 dist-hook: html
 	mkdir $(distdir)/html
-	mkdir $(distdir)/sgml
-	mkdir $(distdir)/tmpl
 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
 
 .PHONY : html
diff --git a/docs/manual/.gitignore b/docs/manual/.gitignore
index 1b70be85cd..dfe4b75320 100644
--- a/docs/manual/.gitignore
+++ b/docs/manual/.gitignore
@@ -2,6 +2,7 @@ Makefile
 Makefile.in
 *.bak
 .deps
+images
 gstreamer-manual
 gstreamer-manual.pdf
 gstreamer-manual.ps
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index 31f548a364..b8a17f27f6 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -112,7 +112,7 @@ pdfdist: pdfdocs
 
 psdocs: $(PSFILES)
 psdist: psdocs
-	@for a $(PSFILES) ; do \
+	@for a in $(PSFILES) ; do \
 	if [ -r $$a ] ; then \
 	    echo "Adding $$a to distribution" ; \
 	    cp -a $$a $(distdir)/ ; \