[Pkg-zsh-commits] [zsh] 05/05: debian/rules: Reduce some make call into fewer ones

Axel Beckert abe at deuxchevaux.org
Sun Nov 12 06:28:04 UTC 2017


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

abe pushed a commit to branch min-dh-oot
in repository zsh.

commit 28b774be557d8beae5b19d03cca459f9c5f701cf
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Nov 12 07:10:35 2017 +0100

    debian/rules: Reduce some make call into fewer ones
    
    Gbp-Dch: Ignore
---
 debian/rules | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4e04d12..021d780 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,9 +106,9 @@ override_dh_auto_install-indep: build-dynamic
 	     done'
 
 # Docs: Info + HTML
-	cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc
+	cd obj && $(MAKE) install.info install.html \
+	    DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/zsh-common/html
 	rm -f debian/zsh-doc/usr/share/info/dir*
-	cd obj && $(MAKE) install.html DESTDIR=$(CURDIR)/debian/zsh-doc htmldir=/usr/share/doc/zsh-common/html
 
 # Work around texi2html unfriendliness
 	sed -i -e 's/<BODY.*>/<BODY LANG="EN">/' debian/zsh-doc/usr/share/doc/zsh-common/html/*.html
@@ -132,9 +132,8 @@ override_dh_compress-indep:
 	dh_compress -i -Xpdf
 
 override_dh_auto_install-arch:
-	cd obj && $(MAKE) install.bin     DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
-	cd obj && $(MAKE) install.modules DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
-
+	cd obj && $(MAKE) install.bin install.modules \
+	    DESTDIR=$(CURDIR)/debian/zsh INSTALL_PROGRAM='$(INSTALL_PROGRAM)'
 	rm debian/zsh/bin/zsh-5.[0-9]*
 
 override_dh_strip-arch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git



More information about the Pkg-zsh-commits mailing list