diff options
| author | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2006-05-23 08:43:31 +0000 |
|---|---|---|
| committer | /C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org> | 2006-05-23 08:43:31 +0000 |
| commit | 9fb3c994a682d21aecde12377f32d81f2d11e382 (patch) | |
| tree | 96e56ed9fba0eecff787ea4d21395cdd50c1bc05 | |
| parent | de6a9db8d3a687521a89690e395939d6feb24bb1 (diff) | |
Replace the libdir variable in ulogd.conf using the method
recommended by the autoconf manual. (Philip Craig)
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f3dc86a..9f11dfb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,19 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 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,@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 diff --git a/configure.in b/configure.in index b2c8770..4f2249b 100644 --- a/configure.in +++ b/configure.in @@ -67,4 +67,4 @@ AC_OUTPUT(doc/Makefile \ 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) |