Don't update CFLAGS if DEB_BUILD_OPTIONS contains noopt.

[pkg-tig.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 969f53ddfe8384586bdf58efcdf2e3eab1e0fccd..92ca06fe392bc5a565e16c3cd302ace7f4f0147c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,23 +11,25 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
+CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS  += -Wall -g -I/usr/include/ncursesw
 
-include /usr/share/dpatch/dpatch.make
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 
-config.status: configure $(DPATCH_STAMPFN)
+LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+
+config.status: configure
        dh_testdir
        ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                --prefix=/usr --mandir=\$${prefix}/share/man --sysconfdir=/etc \
-               CFLAGS="$(CFLAGS)"
+               CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+build: build-arch build-indep
 
-build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: config.status
        dh_testdir
@@ -36,7 +38,7 @@ build-stamp: config.status
        
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
@@ -44,24 +46,28 @@ clean: unpatch
        $(MAKE) clean
        
        rm -f config.h config.log config.make config.status
-       rm -rf manual.html-chunked/
-       rm -f manual.pdf manual.html manual.toc
-       rm -f tig.1 tig.1.html tigrc.5 tigrc.5.html
-       rm -f NEWS.html README.html
+       rm -rf doc/manual.html-chunked/
+       rm -f doc/manual.pdf doc/manual.html doc/manual.toc doc/manual.tex
+       rm -f doc/tigmanual.7
+       rm -f doc/tig.1 doc/tig.1.html doc/tigrc.5 doc/tigrc.5.html
+       rm -f INSTALL.html NEWS.html README.html
        
-       dh_clean 
+       dh_clean
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
        
        $(MAKE) install install-doc DESTDIR=$(CURDIR)/debian/tig
+       # don't ship install instructions; README only links to them
+       rm -f debian/tig/usr/share/doc/tig/INSTALL.html \
+               debian/tig/usr/share/doc/tig/README.html
        
-       mkdir -p debian/tig/etc/bash_completion.d
-       cp contrib/tig-completion.bash debian/tig/etc/bash_completion.d/tig
-       chmod 644 debian/tig/etc/bash_completion.d/tig
+       mkdir -p debian/tig/usr/share/bash-completion/completions
+       cp contrib/tig-completion.bash debian/tig/usr/share/bash-completion/completions/tig
+       chmod 644 debian/tig/usr/share/bash-completion/completions/tig
 
 binary-indep:
        # nothing to do here
@@ -69,9 +75,9 @@ binary-indep:
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
-       dh_installdocs NEWS BUGS TODO manual.pdf
-       dh_installexamples contrib/tigrc
+       dh_installchangelogs NEWS.adoc
+       dh_installdocs doc/manual.pdf
+       dh_installexamples contrib/*.tigrc
        dh_link
        dh_strip
        dh_compress -X.pdf