more minor changes (mostly forgotten things;))

3 files changed, 25 insertions, 29 deletions

diff --git a/INSTALL b/INSTALL
index d75dc528..bace363a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,11 @@
-1.) READ the README.linux file and the accompanying man pages (so it exists ;)).
-    It will save you some frustration. Be sure to review syslogd.conf.sample
-    it currently is the only place that contains information about the new
-    syslogd.conf format!
+1.) READ the README.linux file and the accompanying man pages.
+    It will save you some frustration. Be sure to review sample.conf
+    it has a lot of information and samples on templates. If you
+    want to do all the cool things, this is what you need to know.
 
 2.) Edit the Makefile for your installation.  NOTE that if you have not
     carried out step 1 you may make choices which could render your
     system and/or these utilities unusable.  Compile the utilities.
-    Compilation has been tested with versions 2.5.8, 2.6.3 and 2.7.0 of
-    the gcc compiler and libc versions 4.5.26 and 4.6.27.
 
 3.) The FSSTND makes suggestions as to appropriate locations for
     system binaries.  Since not everyone agrees with standards it is
@@ -26,19 +24,13 @@
     may be security concerns with running it as root.  Please repeat
     step 1 if you are unsure of why this may be the case.
 
-5.) YOU NEED TO DECIDE IF YOU WOULD LIKE TO REPLACE THE STANDARD SYSLOGD OR NOT!
-    The is important as it influences the names used. If you call
-    make install
-    it will install this program under the name of syslogd, but it will save the
-    previous syslogd binary under the name of syslogd-previous. If you call it with
-    make install-replace
-    it will just replace the existing syslogd, but NOT save the former one under
-    the name of syslogd-previous.
-    If you run install multiple times, your syslogd-previous will be OVERWRITTEN!
-    In either case, the system startup files will not be touched. If you use
-    install-replace, everthing should work as always, but if it doesn't, you've
-    probably discovered a beta bug ;) In any case, to use the new features, you 
-    need to update you syslogd.conf.
+5.) Contrary to previous releases, this release does NOT replace the
+    standard syslogd in your system. Instead, the tool is installed
+    under the name rsyslogd. Similarily, it does NOT automatically read
+    syslog.conf, but rsyslog.conf instead. This was done based on user
+    feedback (which re-activated the author's common sense ;)) and will
+    probably save you a lot of hassle. On the other hand, if you used
+    previous versions of rsyslog, you need to change some things now!
 
 6) If you would like to use database logging, you need a database ;)
    The default configuration requires a MonitorWare schema. To do this, you
@@ -50,5 +42,5 @@
    Enter the password if requested. The database "Syslog" with the necessary
    tables is created.
    If you would like to use a different schema, you can do so ;) Just create
-   your schema and database and then create a matching template in syslog.conf.
+   your schema and database and then create a matching template in rsyslog.conf.
    See sample.conf for a description on how templates work.
diff --git a/Makefile b/Makefile
index ac2b1247..a4cf2bc3 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ INSTALL = install
 BINDIR = /usr/sbin
 MANDIR = /usr/share/man
 
-# Uncommenting the following to use mysql.
+# Uncomment the following to use mysql.
 #LIBS = -lmysqlclient #/var/lib/mysql/mysql 
 
 # There is one report that under an all ELF system there may be a need to
@@ -39,11 +39,11 @@ MAN_OWNER = root
 # MAN_OWNER = man
 
 # The following define establishes the name of the pid file for the
-# syslogd daemon.  The library include file (paths.h) defines the
-# name for the syslogd pid to be syslog.pid.  A number of people have
-# suggested that this should be syslogd.pid.  You may cast your
+# rsyslogd daemon.  The library include file (paths.h) defines the
+# name for the rsyslogd pid to be rsyslog.pid.  A number of people have
+# suggested that this should be rsyslogd.pid.  You may cast your
 # ballot below.
-SYSLOGD_PIDNAME = -DSYSLOGD_PIDNAME=\"syslogd.pid\"
+SYSLOGD_PIDNAME = -DSYSLOGD_PIDNAME=\"rsyslogd.pid\"
 
 SYSLOGD_FLAGS= -DSYSLOG_INET -DSYSLOG_UNIXAF -DNO_SCCS ${FSSTND} \
 	${SYSLOGD_PIDNAME}
@@ -55,7 +55,7 @@ DEB =
 
 all: syslogd
 
-test: syslog_tst ksym oops_test tsyslogd
+test: syslog_tst tsyslogd
 
 install: install_man install_exec
 
@@ -96,5 +96,5 @@ install_exec: syslogd
 	${INSTALL} -b -m 500 -s syslogd ${DESTDIR}${BINDIR}/rsyslogd
 
 install_man:
-	${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 rsyslogd.8 ${MANDIR}/man8/rsyslogd.8
-	${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 rsyslog.conf.5 ${MANDIR}/man5/rsyslog.conf.5
+	${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 rsyslogd.8 ${DESTDIR}${MANDIR}/man8/rsyslogd.8
+	${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 rsyslog.conf.5 ${DESTDIR}${MANDIR}/man5/rsyslog.conf.5
diff --git a/sample.conf b/sample.conf
index 2bf85b1b..39f388e3 100644
--- a/sample.conf
+++ b/sample.conf
@@ -1,3 +1,7 @@
+# This is a sample configuation file for rsyslogd. See the
+# man pages for details. Please note that rsyslogd by default
+# reads /etc/rsyslogd.conf (and NOT /etc/syslogd.conf!).
+#
 # A commented sample configuration. More a man page than a real
 # sample ;)
 #
@@ -188,5 +192,5 @@ $template dbFormat,"insert into SystemEvents (Message, Facility,FromHost, Priori
 # as a web-based front-end to a syslog message database.
 #
 # I hope this work is useful.
-# 2004-12-08 Rainer Gerhards <rgerhards@adiscon.com>
+# 2005-03-18 Rainer Gerhards <rgerhards@adiscon.com>
 #