Got rid of doccomedilib, use "configure --docdir=blah" and related

options.  Fixed some problems with "make distcheck".

diff --git a/configure.ac b/configure.ac
index 705e78bdfaeb8dcfdf1baa757974d6dbb7232eb1..15da041302e96edc65598b5517a15e13e829dbf6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -188,10 +188,6 @@ if test "$ENABLE_ETCHOTPLUG" = "no" && test "$ENABLE_UDEVHOTPLUG" = "no" ; then
                AC_MSG_WARN([No hotplug mechanism will we installed. Consult ./configure --help if you want hotplug.])
 fi
 
-#documentaion goes here
-doccomedilibdir="\${datadir}/doc/libcomedi0"
-AC_SUBST(doccomedilibdir) 
-
 AC_CONFIG_FILES(
 Makefile
 comedi_config/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f6262589e164f8ab6f757cc91eca6b202db6e723..39968f89b449173a3a58aaa6b2bea69a8bad82a8 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,9 +9,9 @@ EXTRA_DIST = $(SGML) funcref mkref drivers.txt mkdr FAQ \
 BUILT_SOURCES = funcref.sgml drivers.sgml
 
 if HAVE_DOCBOOK2PDF
-doccomedilib_DATA = comedilib.pdf
+pdf_DATA = comedilib.pdf
 else
-doccomedilib_DATA =
+pdf_DATA =
 endif
 
 if HAVE_DOCBOOK2HTML
@@ -46,19 +46,21 @@ doc_html: $(SGML)
        { $(DOCBOOK2HTML) -o doc_html $(srcdir)/comedilib.sgml && touch doc_html; } || { $(RM) -r doc_html; exit 1; }
 
 install_html:
-       $(INSTALL) -d $(doccomedilibdir)/html
+       $(mkdir_p) $(htmldir)/html
+       chmod u+w $(htmldir)/html
        for each in $(srcdir)/doc_html/*.html $(srcdir)/*.gif ; do \
-               $(INSTALL_DATA) $$each $(doccomedilibdir)/html ; done
+               $(INSTALL_DATA) $$each $(htmldir)/html ; done
 
 uninstall_html:
        for each in $(srcdir)/doc_html/*.html $(srcdir)/*.gif ; do \
-               $(RM) $(doccomedilibdir)/html/`basename $$each` ; done
+               $(RM) $(htmldir)/html/`basename $$each` ; done
 
 man: $(SGML)
        { $(DOCBOOK2MAN) -o man $(srcdir)/comedilib.sgml && touch man; } || { $(RM) -r man; exit 1; }
 
 install_man:
-       $(INSTALL) -d $(mandir)/man3
+       $(mkdir_p) -m 755 $(mandir)/man3
+       chmod u+w $(mandir)/man3
        for each in $(srcdir)/man/*.3 ; do $(INSTALL_DATA) $$each $(mandir)/man3 ; done
 
 uninstall_man:

diff --git a/etc/Makefile.am b/etc/Makefile.am
index dc09ca40ef305c6d72277b2501559a82b4f136b5..397d4a1612ccdc13d43471444b5ad8cdb417e393 100644 (file)
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,6 +1,6 @@
 
 SUBDIRS = pcmcia hotplug udev
 
-doccomedilib_DATA = das1600.conf dt282x.conf modules.conf
+doc_DATA = das1600.conf dt282x.conf modules.conf
 
 EXTRA_DIST = das1600.conf dt282x.conf modules.conf