[Logcheck-commits] Hannes von Haugwitz: Makefile: renamed BINDIR to SBINDIR

[Gerfried Fuchs]

Module: logcheck
Branch: lenny-backports
Commit: bc55d845b6f26e1315277ea6138ffecb6b59665b
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=bc55d845b6f26e1315277ea6138ffecb6b59665b

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Thu Feb 18 21:39:38 2010 +0100

Makefile: renamed BINDIR to SBINDIR

---

 Makefile         |   14 +++++++-------
 debian/changelog |    6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index d43aecc..9b1905d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 CONFDIR = etc/logcheck
-BINDIR = usr/sbin
+SBINDIR = usr/sbin
 SHAREDIR = usr/share/logtail/detectrotate
 
 all:
@@ -10,7 +10,7 @@ install:
 	# Create the directories
 	install -m 750 -d $(DESTDIR)/$(CONFDIR)
 	install -d $(DESTDIR)/var/lib/logcheck
-	install -d $(DESTDIR)/$(BINDIR)
+	install -d $(DESTDIR)/$(SBINDIR)
 	install -d $(DESTDIR)/var/lock/logcheck
 	install -d $(DESTDIR)/$(SHAREDIR)
 
@@ -23,9 +23,9 @@ install:
 	install -m 2750 -d $(DESTDIR)/$(CONFDIR)/violations.ignore.d
 
 	# Install the scripts
-	install -m 755 src/logcheck $(DESTDIR)/$(BINDIR)/
-	install -m 755 src/logtail $(DESTDIR)/$(BINDIR)/
-	install -m 755 src/logtail2 $(DESTDIR)/$(BINDIR)/
+	install -m 755 src/logcheck $(DESTDIR)/$(SBINDIR)/
+	install -m 755 src/logtail $(DESTDIR)/$(SBINDIR)/
+	install -m 755 src/logtail2 $(DESTDIR)/$(SBINDIR)/
 	install -m 755 src/detectrotate/10-savelog.dtr $(DESTDIR)/$(SHAREDIR)/
 	install -m 755 src/detectrotate/20-logrotate.dtr $(DESTDIR)/$(SHAREDIR)/
 	install -m 755 src/detectrotate/30-logrotate-dateext.dtr $(DESTDIR)/$(SHAREDIR)/
@@ -50,8 +50,8 @@ install:
 
 clean:
 	# Remove the scripts
-	-rm -f  $(DESTDIR)/$(BINDIR)/logcheck
-	-rm -f  $(DESTDIR)/$(BINDIR)/logtail
+	-rm -f  $(DESTDIR)/$(SBINDIR)/logcheck
+	-rm -f  $(DESTDIR)/$(SBINDIR)/logtail
 	# Remove the configfiles
 	-rm -f $(DESTDIR)/$(CONFDIR)/logcheck.logfiles
 	-rm -f $(DESTDIR)/$(CONFDIR)/logcheck.conf
diff --git a/debian/changelog b/debian/changelog
index 1297b29..ff59c81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ logcheck (1.3.7) UNRELEASED; urgency=low
   * ignore.d.server/bind:
     - added rules for "received notify for zone" and
       "zone is up to date" message
-  * Makefile: added an empty "all" make target,
-    thanks to Paweł Hajdan, Jr. (closes: #567150)
+  * Makefile:
+    - added an empty "all" make target, thanks to
+      Paweł Hajdan, Jr. (closes: #567150)
+    - renamed BINDIR to SBINDIR
   * ignore.d.server/ssh:
     - added rule for "disconnected by user" message (closes: #567317)
   * ignore.d.workstation/ifplugd: