Sorry, earlier sent rules.diff was 'malformed patch'. Here's a better
formed one :)


Cheers,
Cristian
--- debian/rules.~1~    2005-10-07 10:23:36.000000000 +0200
+++ debian/rules        2005-10-30 23:20:36.463255581 +0100
@@ -5,7 +5,14 @@
   STRIP =: nostrip
 endif
 
-CFLAGS =-g -O2 -Wall
+CFLAGS =-g -Wall
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+  CFLAGS +=-O0
+  STRIP =: nostrip
+else
+  CFLAGS +=-O2
+endif
+
 LDFLAGS =
 CC =gcc
 ifneq (,$(findstring diet,$(DEB_BUILD_OPTIONS)))
@@ -25,12 +32,17 @@
        rm -f admin/socklog && ln -s socklog-2.0.2 admin/socklog
        echo '$(CC) $(CFLAGS)' >admin/socklog/src/conf-cc
        echo '$(CC) $(LDFLAGS)' >admin/socklog/src/conf-ld
+
+       patch -p0 --verbose < socklog.c.patch
+       patch -p0 --verbose < chkshsgr.c.patch
+       patch -p0 --verbose < seek_set.c.patch
+
        $(MAKE) -Cadmin/socklog/src
-       $(MAKE) -Cadmin/socklog/src check
+       #$(MAKE) -Cadmin/socklog/src check
        touch build-arch-stamp
 
 build-indep: deb-checkdir build-indep-stamp
-build-indep-stamp: 
+build-indep-stamp:
        touch build-indep-stamp
 
 clean: deb-checkdir deb-checkuid
@@ -99,7 +111,7 @@
 binary-arch: deb-checkdir deb-checkuid install-arch socklog.deb
        test '$(CC)' != 'gcc' || \
          dpkg-shlibdeps '$(DIR)'/usr/bin/* '$(DIR)'/usr/sbin/*
-       dpkg-gencontrol -isp -psocklog -P'$(DIR)' 
+       dpkg-gencontrol -isp -psocklog -P'$(DIR)'
        dpkg -b '$(DIR)' ..
 
 binary-indep: deb-checkdir deb-checkuid install-indep socklog-run.deb

Reply via email to