Fix bug in make install for manuals.

Original commit message from CVS:
Fix bug in make install for manuals.
Added stuff to .cvsignore in fwg

diff --git a/docs/fwg/.gitignore b/docs/fwg/.gitignore
new file mode 100644 (file)
index 0000000..a4a1709
--- /dev/null
+++ b/docs/fwg/.gitignore
@@ -0,0 +1,12 @@
+Makefile
+Makefile.in
+*.bak
+.deps
+images
+gst-filter-writers-guide
+gst-filter-writers-guide.pdf
+gst-filter-writers-guide.ps
+gst-filter-writers-guide.dvi
+gst-filter-writers-guide.tex
+gst-filter-writers-guide.log
+gst-filter-writers-guide.aux

diff --git a/docs/manuals.mak b/docs/manuals.mak
index 05a371c..859b622 100644 (file)
--- a/docs/manuals.mak
+++ b/docs/manuals.mak
@@ -66,19 +66,21 @@ psdist: psdocs
 # Data to install, in the usual automake way
 docdatadir   = $(datadir)/gstreamer
 docdata_DATA = $(PDFFILES) $(PSFILES)
-pngdatadir   = $(datadir)/gstreamer/gstreamer-manual/images
-pngdata_DATA = $(png_files)
 
 htmlinst:
        @if [ -r $(manualname)/$(htmlname) ] ; then \
-       echo "Installing $(manualname)/*.html" ; \
+           echo "Installing $(manualname)" ; \
            $(mkinstalldirs) $(DESTDIR)$(docdatadir)/$(manualname) ; \
+           $(mkinstalldirs) $(DESTDIR)$(docdatadir)/$(manualname)/images ; \
            $(INSTALL_DATA) $(manualname)/*.html $(DESTDIR)$(docdatadir)/$(manualname) ; \
+           for a in $(png_files); do $(INSTALL_DATA) $$a $(DESTDIR)$(docdatadir)/$(manualname)/images ; done \
        else \
            if [ -r $(srcdir)/$(manualname)/$(htmlname) ] ; then \
-               echo "Installing $(srcdir)/$(manualname)/*.html" ; \
+               echo "Installing $(srcdir)/$(manualname)" ; \
                $(mkinstalldirs) $(DESTDIR)$(docdatadir)/$(manualname) ; \
+               $(mkinstalldirs) $(DESTDIR)$(docdatadir)/$(manualname)/images ; \
                $(INSTALL_DATA) $(srcdir)/$(manualname)/*.html $(DESTDIR)$(docdatadir)/$(manualname) ; \
+               for a in $(png_files); do $(INSTALL_DATA) $$a $(DESTDIR)$(docdatadir)/$(manualname)/images ; done \
            else \
                echo "NOT installing HTML documentation: not present, and can't generate" ; \
            fi \