Changeset 414

Timestamp:

Sep 1, 2012, 5:11:07 PM (12 years ago)

Author:

katerina

Message:

Fix for problem with logrotate script and 'make distcheck'.

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)

trunk/Makefile.in

@@ -613 +613 @@
         fi
         @if test -d /etc/logrotate.d; then \
-                if test ! -f /etc/logrotate.d/@install_name@; then \
-                        cp $(srcdir)/scripts/logrotate /etc/logrotate.d/@install_name@; \
+                if test ! -d $(DESTDIR)/etc/logrotate.d; then \
+                        $(mkinstalldirs) $(DESTDIR)/etc/logrotate.d; \
+                fi; \
+                if test ! -f $(DESTDIR)/etc/logrotate.d/@install_name@; then \
+                        if test -w $(DESTDIR)/etc/logrotate.d; then \
+                                cp $(srcdir)/scripts/logrotate $(DESTDIR)/etc/logrotate.d/@install_name@; \
+                        else \
+                                echo "$(DESTDIR)/etc/logrotate.d not writable"; \
+                        fi; \
                 else \
-                        echo "/etc/logrotate.d/@install_name@ exists, not overwriting"; \
+                        echo "$(DESTDIR)/etc/logrotate.d/@install_name@ exists, not overwriting"; \
                 fi; \
         fi
@@ -1640 +1647 @@
 samhain.startIRIX samhain.startMACOSX
 
-SCRIPTFILES=redhat_i386.client.spec check_samhain.pl samhainadmin.pl logrotate \
+SCRIPTFILES=redhat_i386.client.spec check_samhain.pl samhainadmin.pl \
 yuleadmin.pl samhain.ebuild samhain.ebuild-light samhain.spec
 

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.6:
+        * install logrotate script if /etc/logrotate.d is detected
+        * new option --enable-suid for nagios
         * fix for --enable-ptrace: make the save_tv variable thread specific
         * fix bug in inotify code which made it follow symlinks (by [anonymous])