[gnuplot] 04/04: Fix -arch and -indep package buildings.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot.

commit 785cef644db19fa87f369e677409a54b805daf86
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Aug 1 22:52:57 2014 +0200

    Fix -arch and -indep package buildings.
---
 debian/rules | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index 04755b9..6a4eff8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,17 +36,15 @@ override_dh_auto_configure:
 	mkdir -p $(BUILDDIR_QT)
 	cd $(BUILDDIR_QT); ../../configure $(conf_opts)  --enable-qt --disable-wxt
 
-override_dh_auto_build-arch:
-	dh_auto_build -a -- -C $(BUILDDIR_NOX)/src
-	dh_auto_build -a -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
-	dh_auto_build -a -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
-
-override_dh_auto_build-indep:
+override_dh_auto_build:
+	dh_auto_build -- -C $(BUILDDIR_NOX)/src
+	dh_auto_build -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
+	dh_auto_build -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
 	cp -f term/PostScript/prologue.ps docs/psdoc/
-	dh_auto_build -i -- -C $(BUILDDIR_X11)/docs ps info gpcard.ps
-	dh_auto_build -i -- -C $(BUILDDIR_X11)/tutorial tutorial.dvi tutorial.ps
-	dh_auto_build -i -- -C $(BUILDDIR_X11)/demo
-	dh_auto_build -i -- -C docs/psdoc ps_fontfile_doc.ps
+	dh_auto_build -- -C $(BUILDDIR_X11)/docs ps info gpcard.ps
+	dh_auto_build -- -C $(BUILDDIR_X11)/tutorial tutorial.dvi tutorial.ps
+	dh_auto_build -- -C $(BUILDDIR_X11)/demo
+	dh_auto_build -- -C docs/psdoc ps_fontfile_doc.ps
 	mkdir -p docs/htmldocs
 	$(MAKEINFO) --html --force --output=docs/htmldocs/ docs/gnuplot.texi
 
@@ -81,7 +79,7 @@ override_dh_compress-indep:
 	dh_compress -Xall.dem
 	cd debian/gnuplot-doc/usr/share/doc/gnuplot-doc/examples/; patch -p1 < $(CURDIR)/debian/fix_examples/fix_examples.diff
 
-override_dh_installman:
+override_dh_installman-arch:
 	dh_installman
 	# Fix manpage for nox-version. (Closes: #744218)
 	sed -i 's/\[X11 options\] //g' $(MANPNOX)

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