Adapt the rules file to build using the GNU Makefile.

Still need to reconnect dma-migrate to the build.

diff --git a/changelog b/changelog
index 4acf484d7d626f986e2982f44828f63eeb0d45be..3f4d955662e7eac4f224b9f52d779e4f865aa685 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 dma (0.0.2010.06.17-1) UNRELEASED; urgency=low
 
   * New upstream version:
+    - adapt the rules file to use the GNU Makefile instead of the BSD one
     - update the 01-debian-build patch:
       - no longer patch the BSD Makefile, we use the GNU one now
       - remove the compatibility shims implemented upstream in a different way

diff --git a/rules b/rules
index f29656f86aa2548749b5ad988d14cb68c635668c..a752ab4aa32d63233143543a929d1d1183a7b8f7 100755 (executable)
--- a/rules
+++ b/rules
@@ -8,6 +8,8 @@ CFLAGS=         $(shell dpkg-buildflags --get CFLAGS)
 CPPFLAGS=      $(shell dpkg-buildflags --get CPPFLAGS)
 LDFLAGS=       $(shell dpkg-buildflags --get LDFLAGS)
 
+CFLAGS+=       -DNEED_GETPROGNAME -DNEED_REALLOCF -DNEED_STRLCPY
+
 ifneq (,$(filter werror,$(DEB_BUILD_OPTIONS)))
        CFLAGS+=        -Werror
 endif
@@ -23,17 +25,17 @@ endif
 export CFLAGS CPPFLAGS LDFLAGS
 
 override_dh_auto_build:
-       pmake
-       cd debian/migrate && pmake
+       $(MAKE) -f Makefile.plain
 
 override_dh_auto_clean:
-       pmake clean
-       cd debian/migrate && pmake clean
+       $(MAKE) -f Makefile.plain clean
 
 override_dh_auto_install:
-       pmake DESTDIR=$(CURDIR)/debian/$(PACKAGE) BINDIR=/usr/sbin install
-       cd debian/migrate && pmake DESTDIR=$(CURDIR)/debian/dma-migrate BINDIR=/usr/sbin install
+       $(MAKE) -f Makefile.plain DESTDIR=$(CURDIR)/debian/$(PACKAGE) \
+           PREFIX=/usr CONFDIR=/etc install
        install -d -o root -g mail -m 770 $(CURDIR)/debian/$(PACKAGE)/var/spool/dma
+       install -o root -g mail -m 640 auth.conf dma.conf virtusertable \
+           $(CURDIR)/debian/$(PACKAGE)/etc/dma
 
 override_dh_fixperms:
        dh_fixperms -Xusr/sbin/dma -Xvar/spool/dma -Xetc/dma