[qgis] 06/07: Fix API documentation generation & installation.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit b370fd59af19b25e17a0bdd32481c1435ec8d4d6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jan 19 20:43:51 2016 +0100

    Fix API documentation generation & installation.
---
 debian/changelog | 1 +
 debian/rules     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1410f80..89a8eec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qgis (2.8.6+dfsg-1~exp1) UNRELEASED; urgency=medium
     (closes: #808817)
   * Refresh patches.
   * Update symbols for amd64.
+  * Fix API documentation generation & installation.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 19 Jan 2016 06:56:08 +0100
 
diff --git a/debian/rules b/debian/rules
index 7ea9104..ee34de5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -158,7 +158,7 @@ override_dh_auto_build-arch:
 	dh_auto_build --arch
 
 override_dh_auto_build-indep:
-	cd obj-* && doxygen doc/Doxyfile ; cd -
+	cd $(QGIS_BUILDDIR) && doxygen doc/Doxyfile ; cd -
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -174,8 +174,8 @@ else
 	@echo Skipping tests.
 endif
 
-override_dh_auto_install:
-	dh_auto_install
+override_dh_auto_install-arch:
+	dh_auto_install --arch
 
 	# remove unwanted files
 	$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
@@ -245,7 +245,7 @@ override_dh_auto_install:
 
 override_dh_auto_install-indep:
 	install -o root -g root -m 755 -d $(CURDIR)/debian/tmp/usr/share/qgis/doc
-	mv -v obj-*/doc/api/html $(CURDIR)/debian/tmp/usr/share/qgis/doc/api
+	mv -v $(QGIS_BUILDDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/qgis/doc/api
 
 override_dh_install:
 	dh_install --autodest --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git