* Support unoptimized builds. Reorganize debian/rules and use

    dh_install, to match how I do other packages for my ease of maintenance.

diff --git a/debian/changelog b/debian/changelog
index 2c538141b3f02b6a5e0075a8eab1ac8e9dcab8b8..1f10353d225b27e2bad5e994b82d90be04118dbd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ kftgt (1.7-1) unstable; urgency=low
   * Dependency fixes:  Use dh_perl to get Perl dependencies, move the
     netbase dependency to kftgtd, add a dependency on tcpd since the
     default inetd rule uses it, and remove the kftgtd dependency on Perl.
+  * Support unoptimized builds.  Reorganize debian/rules and use
+    dh_install, to match how I do other packages for my ease of maintenance.
   * Distinguish between kftgt and kftgtd in the short description.
   * Update standards version to 3.6.1 (no changes needed).
   * Update debhelper compatibility level to V4.

diff --git a/debian/kftgt.install b/debian/kftgt.install
new file mode 100644 (file)
index 0000000..98d1583
--- /dev/null
+++ b/debian/kftgt.install
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1

diff --git a/debian/kftgtd.install b/debian/kftgtd.install
new file mode 100644 (file)
index 0000000..b174b44
--- /dev/null
+++ b/debian/kftgtd.install
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man8

diff --git a/debian/rules b/debian/rules
index ba7bead72802405ef4b81bcba2a9ac670fdd1cfc..0b3285dc33243616c80517ebde4dd37a6becdc9b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,75 +4,59 @@
 # kftgt details by Ben Pfaff and Russ Allbery.
 # Released under the GNU GPL.
 
-SHELL = /bin/bash
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
+endif
 
 build: build-stamp
 build-stamp:
        dh_testdir
-       AWK=awk ./configure --prefix=/usr
+       CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+           --mandir=\$${prefix}/share/man
        $(MAKE)
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp install-stamp
-       -rm -f build
        -$(MAKE) -i distclean
-       dh_clean
+       dh_clean build-stamp install-stamp
 
 install: install-stamp
 install-stamp: build-stamp
        dh_testdir
        dh_testroot
-       dh_installdirs
-
-binary: binary-arch
-binary-arch: binary-kftgt binary-kftgtd
+       dh_clean -k
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-server = kftgtd
-client = kftgt
+# We have no architecture-independent files to build.
+binary-indep: build install
 
 export DH_OPTIONS
-binary-kftgt: DH_OPTIONS = -p$(client)
-binary-kftgt: build
+binary-arch: DH_OPTIONS = -a
+binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_clean -k
-       dh_installdocs
-       dh_installdirs usr/bin
-       install kftgt klogin krsh debian/$(client)/usr/bin
+       dh_install
        dh_installchangelogs
-       dh_installman kftgt.1 klogin.1 krsh.1
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_perl
-       dh_installdeb
-       dh_shlibdeps -v kftgt
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary-kftgtd: DH_OPTIONS = -p$(server)
-binary-kftgtd: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
        dh_installdocs
-       dh_installdirs usr/sbin
-       install kftgtd debian/$(server)/usr/sbin
-       dh_installchangelogs
-       dh_installman kftgtd.8
+       dh_installman
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
+       dh_perl
        dh_installdeb
-       dh_shlibdeps -v kftgtd
+       dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
-.PHONY: binary binary-kftgt binary-kftgtd clean checkroot
+binary: binary-indep binary-arch
+.PHONY: binary binary-indep binary-arch build clean install