Patch from Tobias Blaser <tblaser@freesurf.ch>:

Here is a patch to CVS which adds the DESTDIR variable to the installation
rules in the comedilib doc Makefile. Convenient when creating packages.

diff --git a/AUTHORS b/AUTHORS
index a4b9b2e33546b311dc4a879d6d7dce0e32692dde..44632be87800b8b58c571fe712dfb25029e2049d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,7 @@
 # People who have contributed code/documentation to comedilib (alphabetized by last name)
 Ian Abbott <abbotti@mev.co.uk>
 Terry Barnaby <terry1@beam.ltd.uk>
+Tobias Blaser <tblaser@freesurf.ch>
 Anders Blomdell <anders.blomdell@control.lth.se>
 Herman Bruyninckx
 John Conner <conner@empiredi.com>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 39968f89b449173a3a58aaa6b2bea69a8bad82a8..cee18bb736ee2f2b84c21de53163ba2c42f57ddf 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -46,25 +46,25 @@ doc_html: $(SGML)
        { $(DOCBOOK2HTML) -o doc_html $(srcdir)/comedilib.sgml && touch doc_html; } || { $(RM) -r doc_html; exit 1; }
 
 install_html:
-       $(mkdir_p) $(htmldir)/html
-       chmod u+w $(htmldir)/html
+       $(mkdir_p) $(DESTDIR)$(htmldir)/html
+       chmod u+w $(DESTDIR)$(htmldir)/html
        for each in $(srcdir)/doc_html/*.html $(srcdir)/*.gif ; do \
-               $(INSTALL_DATA) $$each $(htmldir)/html ; done
+               $(INSTALL_DATA) $$each $(DESTDIR)$(htmldir)/html ; done
 
 uninstall_html:
        for each in $(srcdir)/doc_html/*.html $(srcdir)/*.gif ; do \
-               $(RM) $(htmldir)/html/`basename $$each` ; done
+               $(RM) $(DESTDIR)$(htmldir)/html/`basename $$each` ; done
 
 man: $(SGML)
        { $(DOCBOOK2MAN) -o man $(srcdir)/comedilib.sgml && touch man; } || { $(RM) -r man; exit 1; }
 
 install_man:
-       $(mkdir_p) -m 755 $(mandir)/man3
-       chmod u+w $(mandir)/man3
-       for each in $(srcdir)/man/*.3 ; do $(INSTALL_DATA) $$each $(mandir)/man3 ; done
+       $(mkdir_p) -m 755 $(DESTDIR)$(mandir)/man3
+       chmod u+w $(DESTDIR)$(mandir)/man3
+       for each in $(srcdir)/man/*.3 ; do $(INSTALL_DATA) $$each $(DESTDIR)$(mandir)/man3 ; done
 
 uninstall_man:
-       for each in $(srcdir)/man/*.3 ; do $(RM) $(mandir)/man3/`basename $$each` ; done
+       for each in $(srcdir)/man/*.3 ; do $(RM) $(DESTDIR)$(mandir)/man3/`basename $$each` ; done
 
 comedilib.pdf: $(SGML)
        $(DOCBOOK2PDF) $(srcdir)/comedilib.sgml