From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 27 Dec 2014 11:12:03 +0000 (+0100)
Subject: Don't chmod init script
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~89^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa287d37f0823be294852097b8069bd1666a501b;p=thirdparty%2Fpdns.git

Don't chmod init script

Let the distributions who still use System V init
handle that themselves. Most of them probably already do this.
---

diff --git a/Makefile.am b/Makefile.am
index 4a09c632b4..efc2ea7687 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,13 +21,4 @@ EXTRA_DIST = \
 
 ACLOCAL_AMFLAGS = -I m4
 
-install-exec-local: 
-	-@chmod +x pdns/pdns.init
-	@echo "***********************************************************"
-	@echo
-	@echo An init.d startup script has been made for you in pdns/pdns.init.
-	@echo You may want to copy this to /etc/init.d or equivalent.
-	@echo
-	@echo "***********************************************************"
-
 dvi: # do nothing to build dvi
diff --git a/build-scripts/rpm-build-instruction b/build-scripts/rpm-build-instruction
index 1fa1dd83bc..4f940e3571 100755
--- a/build-scripts/rpm-build-instruction
+++ b/build-scripts/rpm-build-instruction
@@ -11,8 +11,8 @@ CC="ccache gcc" CXX="ccache g++" CPPFLAGS=-I/usr/local/include/botan-1.10 ./conf
 && make clean && make -j4 && \
 fakeroot /bin/sh -c "rm -rf /tmp/pdns ; DESTDIR=/tmp/pdns make install-strip" &&
 fakeroot rm -f /tmp/pdns/usr/lib/pdns/*.a /tmp/pdns/usr/lib/pdns/*.la &&
-fakeroot mkdir -p /tmp/pdns/etc/init.d &&
-fakeroot cp pdns/pdns.init /tmp/pdns/etc/init.d/pdns &&
+fakeroot install -d -m 755 -o root -g root /tmp/pdns/etc/init.d &&
+fakeroot install -p -m 755 -o root -g root pdns/pdns.init /tmp/pdns/etc/init.d/pdns &&
 fakeroot mkdir -p /tmp/pdns/etc/powerdns &&
 fakeroot mv /tmp/pdns/etc/powerdns/pdns.conf-dist /tmp/pdns/etc/powerdns/pdns.conf &&
 fakeroot rm /tmp/pdns/usr/bin/zone2ldap &&