From d2c54242d9e370005c125b6b92b8c55dadc73fb0 Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Fri, 18 Jun 2010 14:46:46 +0000 Subject: [PATCH] Adapt the rules file to build using the GNU Makefile. Still need to reconnect dma-migrate to the build. --- changelog | 1 + rules | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index 4acf484..3f4d955 100644 --- 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 f29656f..a752ab4 100755 --- 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 -- 2.47.3