diff --git a/Makefile.am b/Makefile.am index c3afee1..25c1c2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,15 @@ sysconf_DATA = LCDd.conf EXTRA_DIST = $(sysconf_DATA) CREDITS README.IRman contrib +## convenience targets +install-html-guides: install-html-developerguide install-html-userguide + +install-html-developerguide: + $(MAKE) -C docs $@ + +install-html-userguide: + $(MAKE) -C docs $@ + dox: $(MAKE) -C docs $@ diff --git a/docs/Makefile.am b/docs/Makefile.am index da31ea3..5006f5c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -15,6 +15,17 @@ EXTRA_DIST = README.dg \ LCDd.8 \ $(doxygen_input) + +## convenience targets +install-html-guides: install-html-developerguide install-html-userguide + +install-html-developerguide: + $(MAKE) -C lcdproc-dev $@ + +install-html-userguide: + $(MAKE) -C lcdproc-user $@ + + ###################################################################### # DOXYGEN stuff # (stolen from cppunit project (http://cppunit.sourceforge.net/) diff --git a/docs/lcdproc-dev/Makefile.am b/docs/lcdproc-dev/Makefile.am index bc062f1..c16750c 100644 --- a/docs/lcdproc-dev/Makefile.am +++ b/docs/lcdproc-dev/Makefile.am @@ -11,4 +11,13 @@ EXTRA_DIST = lcdproc-dev.docbook \ license.docbook \ README.docbook + +## convenience targets +xmlto = /usr/bin/xmlto +developerguidedir = $(DESTDIR)$(htmldir)/developer-guide/ + +install-html-developerguide: $(xmlto) lcdproc-dev.docbook + $(mkinstalldirs) $(developerguidedir) + $(xmlto) html -o $(developerguidedir) lcdproc-dev.docbook + ## EOF diff --git a/docs/lcdproc-user/Makefile.am b/docs/lcdproc-user/Makefile.am index e7f214f..22b124c 100644 --- a/docs/lcdproc-user/Makefile.am +++ b/docs/lcdproc-user/Makefile.am @@ -14,4 +14,13 @@ EXTRA_DIST = bookinfo.docbook \ running.docbook \ README.docbook + +## convenience targets +xmlto = /usr/bin/xmlto +userguidedir = $(DESTDIR)$(htmldir)/user-guide/ + +install-html-userguide: $(xmlto) lcdproc-user.docbook + $(mkinstalldirs) $(userguidedir) + $(xmlto) html -o $(userguidedir) lcdproc-user.docbook + ## EOF diff --git a/scripts/debian/control b/scripts/debian/control index 524d5a4..c130798 100644 --- a/scripts/debian/control +++ b/scripts/debian/control @@ -2,7 +2,7 @@ Source: lcdproc Section: utils Priority: extra Maintainer: Jonathan Oxer -Build-Depends: debhelper (>= 4.0.0), automake1.7, autoconf, texinfo, libncurses5-dev, libusb-dev (>= 0.1.8), libsvga1-dev, libxosd-dev +Build-Depends: debhelper (>= 4.0.0), automake1.9, autoconf, xmlto, texinfo, libncurses5-dev, libusb-dev (>= 0.1.8), libsvga1-dev, libxosd-dev Standards-Version: 3.6.2 Package: lcdproc diff --git a/scripts/debian/dirs b/scripts/debian/dirs index 8adb250..80d7668 100644 --- a/scripts/debian/dirs +++ b/scripts/debian/dirs @@ -4,6 +4,7 @@ etc/default etc/lcdproc usr/bin usr/sbin +usr/share/doc/lcdproc/user-guide/ usr/share/doc/lcdproc/examples usr/share/man/man1 usr/share/man/man8 diff --git a/scripts/debian/rules b/scripts/debian/rules index a258a6f..fe12566 100755 --- a/scripts/debian/rules +++ b/scripts/debian/rules @@ -75,6 +75,7 @@ install: build # Add here commands to install the package into debian/lcdproc. $(MAKE) install DESTDIR=$(CURDIR)/debian/lcdproc + $(MAKE) install-html-userguide DESTDIR=$(CURDIR)/debian/lcdproc # install config file (with some corrections sed -e '/^DriverPath=/s,server/drivers,/usr/lib/lcdproc,' \