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
This commit is contained in:
Richard Boulton 2000-12-31 13:55:33 +00:00
parent 0ee56888a8
commit 900dba8811
2 changed files with 18 additions and 4 deletions

12
docs/fwg/.gitignore vendored Normal file
View file

@ -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

View file

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