[ismrmrd] 119/129: d/rules: further simplification

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:00:28 UTC 2015


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

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit 52eb147b2660e92598589f49a8ffa505658e4a85
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 14 19:14:44 2015 +0000

    d/rules: further simplification
---
 debian/rules | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/debian/rules b/debian/rules
index c81f3e6..a85fed1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,22 +13,16 @@ BINARYPKG=lib$(SOURCEPKG)1.2
 APIDOCPKG=lib$(SOURCEPKG)-dev-doc
 
 %:
-	dh $@ --parallel --buildsystem=cmake --builddirectory=$(BUILDDIR)
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -DUSE_SYSTEM_PUGIXML=ON
+	dh_auto_configure -- -DUSE_SYSTEM_PUGIXML=ON
 
-override_dh_auto_build-indep:
-ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	cd $(BUILDDIR); $(MAKE) apidoc
-endif
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(BUILDDIR)
 
-override_dh_installdocs-indep:
-ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	dh_installdocs --package=$(APIDOCPKG) \
-		debian/build/doc/doxygen/doc/html
-	rm debian/$(APIDOCPKG)/usr/share/doc/$(APIDOCPKG)/html/jquery.js
-	dh_link --package=$(APIDOCPKG) \
-		usr/share/javascript/jquery/jquery.js \
-		usr/share/doc/$(APIDOCPKG)/html/jquery.js 
-endif
+override_dh_auto_build:
+	dh_auto_build
+	# Make doc (see wiki/VTK/debian/buildingDoxygen)
+	cd $(BUILDDIR) && $(MAKE) apidoc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git



More information about the debian-science-commits mailing list