Sigh, now with fixed indentation and man page path.

Nowadays dh_auto_configure passes all the needed paths to ./configure
including --mandir, so debian/patches/fix_mandir.patch is not needed.

Peter
--- a/debian/patches/fix_mandir.patch
+++ b/debian/patches/fix_mandir.patch
@@ -1,16 +0,0 @@
-Author: Jordi Mallach <jo...@debian.org>
-Description: Install manpages in the FHS directory.
-Forwarded: no
-
-Index: fcgiwrap-1.1.0/Makefile.in
-===================================================================
---- fcgiwrap-1.1.0.orig/Makefile.in
-+++ fcgiwrap-1.1.0/Makefile.in	2013-12-19 19:03:21.717676200 +0100
-@@ -1,6 +1,6 @@
- targetdir = $(DESTDIR)@prefix@@sbindir@
--man8dir = $(DESTDIR)@prefix@@mandir@/man8
-+man8dir = $(DESTDIR)@prefix@@datarootdir@@mandir@/man8
- datarootdir =
- 
- .PHONY:	clean distclean
- 
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 GIT-Add-p-path-option-to-restrict-scripts.patch
 fix_systemd.patch
-fix_mandir.patch
 systemd_socket_requires.patch
 libsystemd.patch
 systemd_use_defaults.patch
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,14 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@ --with systemd,autoreconf
 
-CONFIGURE_FLAGS := --prefix /usr
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	CONFIGURE_FLAGS += --with-systemd \
-		    	   --with-systemdsystemunitdir=/lib/systemd/system
+CONFIGURE_FLAGS += --with-systemd \
+		   --with-systemdsystemunitdir=/lib/systemd/system
 endif
 
-override_dh_auto_build:
-	autoreconf -i
-	./configure $(CONFIGURE_FLAGS)
-	$(MAKE)
-
-override_dh_clean:
-	rm -f aclocal.m4
-	dh_clean
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_FLAGS)

Reply via email to