- bump version number

- preliminary 'make distrib' support (stolen from iptables)

diff --git a/Makefile.in b/Makefile.in
index 1a2f55b48cdbeb68c23599a790278b89de4cee66..62c801564eea159fb403ccb78644dcfb6f14b653 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-#
+
 
 include @top_srcdir@/Rules.make
 CFLAGS+=-I@top_srcdir@/libipulog/include -I@top_srcdir@/include
@@ -20,13 +20,38 @@ else
 SUBDIRS+=pcap
 endif
 
+
+ULOGD_VERSION=1.10
+OLD_ULOGD_VERSION=1.09
+
 #  Normally You should not need to change anything below
 
 all: recurse ulogd
 
-distrib:
-       @for d in $(SUBDIRS); do if ! make -C $$d distrib; then exit 1; fi; done
-       @make distclean
+.PHONY: distclean
+distclean: clean
+       @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
+       rm -f Makefile config.cache config.log config.status Rules.make
+
+.PHONY: distrib
+distrib: check distclean delrelease $(RELEASE_DIR)/ulogd-$(ULOGD_VERSION).tar.bz2 diff md5sums
+
+.PHONY: check
+check:
+       @if echo $(CFLAGS) | egrep -e '-g|-pg' > /dev/null; then echo Remove debugging flags; exit 1; else exit 0; fi
+
+.PHONY: delrelease
+delrelease:
+       rm -f $(RELEASE_DIR)/ulogd-$(ULOGD_VERSION).tar.bz2
+
+$(RELEASE_DIR)/ulogd-$(ULOGD_VERSION).tar.bz2:
+       cd .. & ln -sf ulogd ulogd-$(ULOGD_VERSION) && tar cvf - --exclude CVS --exclude .svn ulogd-$(ULOGD_VERSION)/. | bzip2 -9 > $@ && rm ulogd-$(ULOGD_VERSION)
+
+.PHONY: diff
+diff: $(RELEASE_DIR)/ulogd-$(ULOGD_VERSION).tar.bz2
+       @mkdir /tmp/diffdir
+       @cd /tmp/diffdir && tar -x --bzip2 -f $(RELEASE_DIR)/ulogd-$(ULOGD_VERSION).tar.bz2
+       @set -e; cd /tmp/diffdir; tar -x --bzip2 -f $(RELEASE_DIR)/ulogd-$(OLD_ULOGD_VERSION).tar.bz2; echo Creating patch-ulogd-$(OLD_ULOGD_VERSION)-$(ULOGD_VERSION).bz2; diff -urN ulogd-$(OLD_ULOGD_VERSION) ulogd-$(ULOGD_VERSION) | bzip2 -9 > $(RELEASE_DIR)/patch-ulogd-$(OLD_ULOGD_VERSION)-$(ULOGD_VERSON).bz2
 
 recurse: 
        @for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
@@ -44,16 +69,12 @@ clean:
        rm -f ulogd ulogd.o ulogd.conf
        @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
 
-distclean: clean
-       @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
-       rm -f Makefile config.cache config.log config.status Rules.make
-
 install: all
        @for d in $(SUBDIRS); do if ! make -C $$d $@; then exit 1; fi; done
-       @[ -d $(DESTDIR)@sbindir@ ] || mkdir -p $(DESTDIR)@sbindir@
-       @INSTALL@ -D -m 755 ulogd $(DESTDIR)@sbindir@/ulogd
-       @[ -d $(DESTDIR)@sysconfdir@ ] || mkdir -p $(DESTDIR)@sysconfdir@
-       @[ -f $(DESTDIR)@sysconfdir@/ulogd.conf ] || @INSTALL@ -D -m 600 ulogd.conf $(DESTDIR)@sysconfdir@/ulogd.conf
+       @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
+       @INSTALL@ -D -m 755 ulogd $(DESTDIR)$(BINDIR)/ulogd
+       @[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR)
+       @[ -f $(DESTDIR)$(ETCDIR)/ulogd.conf ] || @INSTALL@ -D -m 600 ulogd.conf $(DESTDIR)$(ETCDIR)/ulogd.conf
        
 doc:
        $(MAKE) -C $@

diff --git a/Rules.make.in b/Rules.make.in
index e1d1730e24170f2be162b77939e3b042056d51a5..21b05d9ca6ff466697d9ce873c6353071a8c41bd 100644 (file)
--- a/Rules.make.in
+++ b/Rules.make.in
@@ -1,9 +1,9 @@
 #
 
-prefix=@prefix@
+PREFIX=@prefix@
 exec_prefix=@exec_prefix@
-sysconfdir=@sysconfdir@
-sbindir=@sbindir@
+ETCDIR=@sysconfdir@
+BINDIR=@sbindir@
 
 ULOGD_CONFIGFILE=@sysconfdir@/ulogd.conf
 

diff --git a/ulogd.c b/ulogd.c
index e3bdba4c7ced553afc5b8b9ca158e445fcdc855c..db6ecd83857def4967713d3d4994b96747621413 100644 (file)
--- a/ulogd.c
+++ b/ulogd.c
@@ -1,6 +1,6 @@
-/* ulogd, Version $Revision: 1.36 $
+/* ulogd, Version $LastChangedRevision$
  *
- * $Id: ulogd.c,v 1.36 2003/08/23 17:52:37 laforge Exp $
+ * $Id$
  *
  * userspace logging daemon for the iptables ULOG target
  * of the linux 2.4 netfilter subsystem.
@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: ulogd.c,v 1.36 2003/08/23 17:52:37 laforge Exp $
+ * $Id$
  *
  * Modifications:
  *     14 Jun 2001 Martin Josefsson <gandalf@wlug.westbo.se>
@@ -34,7 +34,7 @@
  *             - added support for more flexible multi-section conffile
  */
 
-#define ULOGD_VERSION  "1.10"
+#define ULOGD_VERSION  "1.20"
 
 #include <unistd.h>
 #include <stdio.h>