From d2708571d4eb2f7daaeff15a2456912251e5b957 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Sun, 19 Aug 2007 18:39:03 +0000 Subject: [PATCH] Patch from Tobias Blaser : Here is a patch to CVS which adds the DESTDIR variable to the installation rules in the comedilib doc Makefile. Convenient when creating packages. --- AUTHORS | 1 + doc/Makefile.am | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index a4b9b2e..44632be 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,7 @@ # People who have contributed code/documentation to comedilib (alphabetized by last name) Ian Abbott Terry Barnaby +Tobias Blaser Anders Blomdell Herman Bruyninckx John Conner diff --git a/doc/Makefile.am b/doc/Makefile.am index 39968f8..cee18bb 100644 --- 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 -- 2.26.2