[Debian-ha-commits] [crmsh] 04/09: Multiple edits;

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository crmsh.

commit 19419c3115ebed16c7338cc27c9fd981b04fa403
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 30 16:35:45 2015 -0400

    Multiple edits;
    
     - Removed invalid string from rules file that did not belong
     - Modified dh_auto_install override so that it removes
       duplicates from correct directory
     - Override dh_auto_build to enforce building of all components
       of the package
     - Override dh_auto_configure so that install directories are set
       properly
    
    Change-Id: I5ce52e8327d027185fb89ce0c78a00adc8680989
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/rules | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index ffdbdb6..4548d9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,19 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 %:
 	dh $@ --with autoreconf,python2 --fail-missing
 
-DOC = debian/tmp/usr/share/doc/crmsh
-	-dh_auto_test
+override_dh_auto_configure:
+	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc \
+	    --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
+	    --docdir=/usr/share/doc/crmsh --htmldir=/usr/share/doc/crmsh/html --with-asciidoc
+
+DOC = debian/crmsh/usr/share/doc/crmsh
+HTML = debian/crmsh/usr/share/doc/crmsh/html
+
+override_dh_auto_build:
+	dh_auto_build
+# Manually invoke building of the asciidoc html documentation
+	cd $(CURDIR)/doc/website-v1 && $(MAKE)
+	cd $(CURDIR)/../
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/crmsh.git