X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=5a65ec5ccf949a0c8361a25f7caad1c770e3eed4;hb=4228d7368bb131d65b6cc7bb3ba9d3c070ada5d3;hp=8eba169cf8cd367940043ffb15816c20e5d43f06;hpb=ad7dd95f8e6b93b2db436e3131ca42e4a623d306;p=nfs-utils.git

diff --git a/debian/rules b/debian/rules
index 8eba169..5a65ec5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,28 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+#! /usr/bin/make -f
 
-DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_ARCH		:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_OS	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+include /usr/share/quilt/quilt.make
+
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Temporary root
-DEBTMP	:= $(shell pwd)/debian/tmp
+DEBTMP := $(CURDIR)/debian/tmp
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
-ifeq ($(DEB_HOST_ARCH),ia64)
-	patch -p1 < debian/bzero.patch
-endif
 	CFLAGS="-g -O2 -Wall" ./configure \
 		--mandir='$${prefix}/share/man' \
-		--enable-secure-statd 
+		--enable-secure-statd \
+		--with-tcp-wrappers
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	rm -rf $(DEBTMP)
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 binary-indep: build
@@ -38,13 +34,6 @@ binary-arch: build
 	mkdir $(DEBTMP)
 	$(MAKE) DESTDIR='$(DEBTMP)' install
 	dh_install
-	
-	# Fix up the manpages
-	for f in lockd statd showmount; do \
-	  perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
-	    debian/tmp/usr/share/man/man8/$$f.8; \
-	done;
-	
 	dh_installdocs -A
 	dh_installdocs -pnfs-common debian/README.Debian.nfsv4
 	install -m 0755 debian/nfs-common.init debian/nfs-common/etc/init.d/nfs-common
@@ -55,6 +44,7 @@ binary-arch: build
 	dh_strip
 	dh_compress
 	dh_fixperms
+	chmod u+s debian/nfs-common/sbin/mount.nfs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol