[netfilter-cvslog] r6610 - branches/ulog/ulogd2

laforge at netfilter.org laforge at netfilter.org
Tue May 23 10:43:32 CEST 2006


Author: laforge at netfilter.org
Date: 2006-05-23 10:43:31 +0200 (Tue, 23 May 2006)
New Revision: 6610

Modified:
   branches/ulog/ulogd2/Makefile.am
   branches/ulog/ulogd2/configure.in
Log:
Replace the libdir variable in ulogd.conf using the method                                                 
recommended by the autoconf manual.  (Philip Craig)


Modified: branches/ulog/ulogd2/Makefile.am
===================================================================
--- branches/ulog/ulogd2/Makefile.am	2006-05-23 08:41:28 UTC (rev 6609)
+++ branches/ulog/ulogd2/Makefile.am	2006-05-23 08:43:31 UTC (rev 6610)
@@ -3,11 +3,19 @@
 
 man_MANS = ulogd.8
 
-EXTRA_DIST = $(man_MANS) debian ulogd.logrotate ulogd.spec ulogd.conf
+EXTRA_DIST = $(man_MANS) debian ulogd.logrotate ulogd.spec
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 SUBDIRS = include doc libipulog src input filter output
 
+noinst_DATA = ulogd.conf
+
+edit = sed \
+	-e 's, at libdir\@,$(libdir),g'
+
+ulogd.conf: Makefile $(srcdir)/ulogd.conf.in
+	$(edit) $(srcdir)/ulogd.conf.in >ulogd.conf
+
 $(OBJECTS): libtool
 libtool: $(LIBTOOL_DEPS)
 	$(SHELL) ./config.status --recheck

Modified: branches/ulog/ulogd2/configure.in
===================================================================
--- branches/ulog/ulogd2/configure.in	2006-05-23 08:41:28 UTC (rev 6609)
+++ branches/ulog/ulogd2/configure.in	2006-05-23 08:43:31 UTC (rev 6610)
@@ -67,4 +67,4 @@
 	  input/Makefile input/packet/Makefile input/flow/Makefile \
 	  filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
 	  output/Makefile output/pcap/Makefile output/mysql/Makefile output/pgsql/Makefile output/sqlite3/Makefile \
-	  src/Makefile Makefile Rules.make ulogd.conf)
+	  src/Makefile Makefile Rules.make)




More information about the netfilter-cvslog mailing list