Mercurial > dropbear
diff debian/rules @ 835:4095b6d7c9fc ecc
Merge in changes from the past couple of releases
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 18 Oct 2013 21:38:01 +0800 |
parents | 7b68e581985f |
children |
line wrap: on
line diff
--- a/debian/rules Sat May 25 00:54:19 2013 +0800 +++ b/debian/rules Fri Oct 18 21:38:01 2013 +0800 @@ -1,5 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + #export DH_OPTIONS DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -9,13 +13,6 @@ STRIP =: nostrip endif -CFLAGS =-Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS +=-O0 -else - CFLAGS +=-O2 -endif - CONFFLAGS = CC =gcc ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS))) @@ -79,12 +76,12 @@ ln -s /var/log/dropbear '$(DIR)'/etc/dropbear/log/main # man pages install -d -m0755 '$(DIR)'/usr/share/man/man8 - for i in dropbear.8 dropbearkey.8; do \ - install -m644 $$i '$(DIR)'/usr/share/man/man8/ || exit 1; \ + install -d -m0755 '$(DIR)'/usr/share/man/man1 + install -m644 dropbear.8 '$(DIR)'/usr/share/man/man8/ + for i in dbclient.1 dropbearkey.1 dropbearconvert.1; do \ + install -m644 $$i '$(DIR)'/usr/share/man/man1/ || exit 1; \ done gzip -9 '$(DIR)'/usr/share/man/man8/*.8 - install -d -m0755 '$(DIR)'/usr/share/man/man1 - install -m644 dbclient.1 '$(DIR)'/usr/share/man/man1/ gzip -9 '$(DIR)'/usr/share/man/man1/*.1 # copyright, changelog cat debian/copyright.in LICENSE >debian/copyright