diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/rsyslog.install | 3 | ||||
| -rwxr-xr-x | debian/rules | 16 |
3 files changed, 19 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 21f6a2e..94835c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rsyslog (7.3.12-3) UNRELEASED; urgency=low + + * Only build and install the imkmsg module on Linux. + + -- Michael Biebl <biebl@debian.org> Fri, 26 Apr 2013 16:42:36 +0200 + rsyslog (7.3.12-2) experimental; urgency=low * Fix build when libgcrypt support is disabled to not pick up an unnecessary diff --git a/debian/rsyslog.install b/debian/rsyslog.install index 08b3138..07b6e7e 100644 --- a/debian/rsyslog.install +++ b/debian/rsyslog.install @@ -4,9 +4,8 @@ usr/sbin/ usr/share/man/ usr/lib/rsyslog/imfile.so usr/lib/rsyslog/imklog.so -usr/lib/rsyslog/imkmsg.so usr/lib/rsyslog/immark.so -usr/lib/rsyslog/imp*.so +usr/lib/rsyslog/impstats.so usr/lib/rsyslog/imtcp.so usr/lib/rsyslog/imudp.so usr/lib/rsyslog/imuxsock.so diff --git a/debian/rules b/debian/rules index dda1ecb..2616c8c 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,8 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) dh $@ --with autoreconf ifeq ($(DEB_HOST_ARCH_OS), linux) -confflags += --enable-imptcp +confflags += --enable-imptcp \ + --enable-kmsg endif override_dh_auto_configure: @@ -21,7 +22,6 @@ override_dh_auto_configure: --enable-mail \ --enable-imfile \ --enable-impstats \ - --enable-kmsg \ --enable-klog \ --enable-gssapi-krb5 \ --enable-gnutls \ @@ -42,11 +42,19 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install - install --mode=644 -D plugins/ommysql/createDB.sql debian/rsyslog-mysql/usr/share/dbconfig-common/data/rsyslog-mysql/install/mysql - install --mode=644 -D plugins/ompgsql/createDB.sql debian/rsyslog-pgsql/usr/share/dbconfig-common/data/rsyslog-pgsql/install/pgsql + install --mode=644 -D plugins/ommysql/createDB.sql \ + debian/rsyslog-mysql/usr/share/dbconfig-common/data/rsyslog-mysql/install/mysql + install --mode=644 -D plugins/ompgsql/createDB.sql \ + debian/rsyslog-pgsql/usr/share/dbconfig-common/data/rsyslog-pgsql/install/pgsql override_dh_install: dh_install -X .la --list-missing +ifeq ($(DEB_HOST_ARCH_OS), linux) + install --mode=644 debian/tmp/usr/lib/rsyslog/imkmsg.so \ + debian/rsyslog/usr/lib/rsyslog/ + install --mode=644 debian/tmp/usr/lib/rsyslog/imptcp.so \ + debian/rsyslog/usr/lib/rsyslog/ +endif override_dh_compress: dh_compress -X rsyslog-example.conf |