From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 8 Jul 2003 22:13:00 +0000 (+0000)
Subject: make install-data-local target conditional, and use $(INSTALL_DATA)
X-Git-Tag: r0_7_21~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81df61bede802814263a9e54754e48156b78d996;p=comedilib.git

make install-data-local target conditional, and use $(INSTALL_DATA)
instead of $(INSTALL)
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b3f8abd..19440ae 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,32 +8,31 @@ EXTRA_DIST=$(SGML) comedilib.sgml funcref mkref drivers.txt mkdr acq-seq.gif
 
 if HAVE_DOCBOOK
 all-local: html $(DOC).pdf man
+
+install-data-local:
+	$(INSTALL) -d $(mandir)/man3
+	$(INSTALL_DATA) man/*.3 $(mandir)/man3
+	$(INSTALL) -d $(pkgdatadir)/html
+	$(INSTALL_DATA) html/* $(pkgdatadir)/html
 else
-all-local:
 endif
 
 clean-local:
 	rm -rf comedilib.pdf drivers.sgml funcref.sgml
 	rm -rf html man
 
-install-data-local:
-	$(INSTALL) -d $(mandir)/man3
-	$(INSTALL) man/*.3 $(mandir)/man3
-	$(INSTALL) -d $(pkgdatadir)/html
-	$(INSTALL) html/* $(pkgdatadir)/html
-
 locales = de
 
 $(DOC).pdf: $(DOC).sgml $(SGML)
-	-$(JW_PATH) -f docbook -b pdf $(DOC).sgml
+	$(JW_PATH) -f docbook -b pdf $(DOC).sgml
 
 html: $(DOC).sgml $(SGML)
-	-mkdir -p html
-	-$(JW_PATH) -f docbook -b html -o html $(DOC).sgml && touch html
+	mkdir -p html
+	$(JW_PATH) -f docbook -b html -o html $(DOC).sgml && touch html
 
 man: $(DOC).sgml $(SGML)
-	-mkdir -p man
-	-$(JW_PATH) -f docbook -b man -o man $(DOC).sgml && touch man
+	mkdir -p man
+	$(JW_PATH) -f docbook -b man -o man $(DOC).sgml && touch man
 
 funcref.sgml: funcref mkref
 	./mkref funcref >funcref.sgml