X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=debian%2Frules;h=08e7b497fa922bff0e9710511191f28f7f30c653;hb=051725bc40aea63ff1e9c53fcde4803f476255c3;hp=ab73041cc3407370d2c27223054c50f3c9298aa3;hpb=a37c88d57c40fa31802a1dbfb742a34e7e8b0295;p=ckermit.git

diff --git a/debian/rules b/debian/rules
index ab73041..08e7b49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 BUILDDIR=`pwd`/debian/ckermit
 
-CFLAGS =-g \
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += `dpkg-buildflags --get CPPFLAGS`
+CFLAGS +=-g \
 	-DIKSDCONF=\\\\\\\\\\\\\\\"/etc/kermit/iksd.conf\\\\\\\\\\\\\\\"  \
 	-DCK_SYSINI=\\\\\\\\\\\\\\\"/etc/kermit/kermrc\\\\\\\\\\\\\\\"  \
-	-DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER
+	-DCK_INI_B -DX509_SUBJECT_ALT_NAME_TO_USER -DDISABLE_SSLV3
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -18,11 +22,18 @@ else
 endif
 
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ifneq (,$(or $(findstring kfreebsd, $(DEB_HOST_ARCH_OS)), $(findstring hurd, $(DEB_HOST_ARCH_OS))))
 	CFLAGS += -DSELECT
 endif
 
-MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' LNKFLAGS="-Wl,-z,defs -Wl,--as-needed"
+ifeq (,$(findstring hurd, $(DEB_HOST_ARCH_OS)))
+	CFLAGS += -DHAVE_PTMX
+endif
+
+LINKERFLAGS=`dpkg-buildflags --get LDFLAGS`
+LINKERFLAGS+=-Wl,-z,defs -Wl,--as-needed
+
+MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/man/man1 INFODIR=/usr/share/doc/ckermit KFLAGS='$(CFLAGS)' MULTIARCH=\"$(DEB_HOST_MULTIARCH)\" LNKFLAGS="$(LINKERFLAGS)"
 MAKETARGET=linux+krb5+openssl
 
 %:
@@ -50,7 +61,7 @@ override_dh_auto_install:
 	rm "$(BUILDDIR)/usr/share/doc/ckermit/COPYING.TXT"
 
 override_dh_installchangelogs:
-	dh_installchangelogs -k ckc301.txt
+	dh_installchangelogs -k ckc302.txt
 
 override_dh_installpam:
 	dh_installpam --name=kermit