[Pkg-zsh-commits] [SCM] Debian zsh package branch, debian, updated. debian/5.0.2-2-11-g336b60e

Axel Beckert abe at deuxchevaux.org
Sat Jan 5 04:04:23 UTC 2013


The following commit has been merged in the debian branch:
commit 336b60ea2372352d82af10c32445ae3cee472c63
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Jan 5 04:45:12 2013 +0100

    CONFIGFLAGS and STATICFLAGS: Only one flag per line

diff --git a/debian/rules b/debian/rules
index 54b1b44..dcbb554 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,24 +16,31 @@ ifeq (zsh-beta,$(package))
 CFLAGS += -W
 endif
 
-CONFIGFLAGS = --prefix=/usr --mandir=/usr/share/man --bindir=/bin LDFLAGS="-Wl,--as-needed -g $(H_LDFLAGS)"
+CONFIGFLAGS =  --prefix=/usr
+CONFIGFLAGS += --mandir=/usr/share/man
+CONFIGFLAGS += --bindir=/bin
+CONFIGFLAGS += LDFLAGS="-Wl,--as-needed -g $(H_LDFLAGS)"
 
 ifeq (zsh-beta,$(package))
 CONFIGFLAGS += --program-suffix=-beta
 endif
 
-CONFIGFLAGS += --infodir=/usr/share/info --enable-maildir-support
-CONFIGFLAGS += --enable-max-jobtable-size=256 --enable-etcdir=/etc/$(package)
+CONFIGFLAGS += --infodir=/usr/share/info
+CONFIGFLAGS += --enable-maildir-support
+CONFIGFLAGS += --enable-max-jobtable-size=256
+CONFIGFLAGS += --enable-etcdir=/etc/$(package)
 CONFIGFLAGS += --enable-function-subdirs
 CONFIGFLAGS += --enable-site-fndir=/usr/local/share/$(package)/site-functions
 CONFIGFLAGS += --enable-fndir=/usr/share/$(package)/functions
-CONFIGFLAGS += --with-tcsetpgrp --with-term-lib="ncursesw tinfo"
+CONFIGFLAGS += --with-tcsetpgrp
+CONFIGFLAGS += --with-term-lib="ncursesw tinfo"
 CONFIGFLAGS += --enable-cap --enable-pcre
 CONFIGFLAGS += --enable-readnullcmd=pager
 CONFIGFLAGS += --enable-custom-patchlevel=Debian
 CONFIGFLAGS += --enable-additional-fpath=/usr/share/zsh/vendor-functions,/usr/share/zsh/vendor-completions
 
-STATICFLAGS = --disable-dynamic --enable-ldflags=-static
+STATICFLAGS =  --disable-dynamic
+STATICFLAGS += --enable-ldflags=-static
 ifneq (zsh-beta,$(package))
 STATICFLAGS += --disable-dynamic-nss
 endif

-- 
Debian zsh package



More information about the Pkg-zsh-commits mailing list