diff options
| author | Michael Biebl <biebl@debian.org> | 2010-10-05 17:28:41 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-10-05 17:28:41 +0200 |
| commit | 7e2b1add5ffd1d726801b5f3806c7e26f493c3e9 (patch) | |
| tree | f904f13dfdb0a339afd6f461c71315fd5ab63050 /tools | |
| parent | 017fb92bd811ce1083504eafda4e2080d9520a31 (diff) | |
| download | rsyslog-7e2b1add5ffd1d726801b5f3806c7e26f493c3e9.tar.gz | |
Imported Upstream version 5.7.1upstream/5.7.1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 3 | ||||
| -rw-r--r-- | tools/syslogd.c | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 96657ad..6541194 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,7 +36,7 @@ rsyslogd_SOURCES = \ \ ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) +rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) -lm rsyslogd_LDFLAGS = -export-dynamic if ENABLE_DIAGTOOLS diff --git a/tools/Makefile.in b/tools/Makefile.in index c1b6392..3aca095 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -286,6 +286,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ @@ -326,7 +327,7 @@ rsyslogd_SOURCES = \ ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) +rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) -lm rsyslogd_LDFLAGS = -export-dynamic @ENABLE_DIAGTOOLS_TRUE@rsyslog_diag_hostname_SOURCES = gethostn.c @ENABLE_DIAGTOOLS_TRUE@zpipe_SOURCES = zpipe.c diff --git a/tools/syslogd.c b/tools/syslogd.c index 56000e0..4964f8f 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2437,10 +2437,9 @@ doGlblProcessInit(void) for (i = 3; i < num_fds; i++) (void) close(i); untty(); - } - else - { - fputs(" Already running.\n", stderr); + } else { + fputs(" Already running. If you want to run multiple instances, you need " + "to specify different pid files (use -i option)\n", stderr); exit(1); /* "good" exit, done if syslogd is already running */ } } |