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 4a09c632b4b5fe7d86ba593c43e3417fe917fc28..efc2ea7687362780dbccf2a679733eb1f006a8fb 100644 (file)
--- 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 1fa1dd83bcd61ad34d13b92e090258ebaedaba72..4f940e3571233c083825988d0bd3a35c1dff5bee 100755 (executable)
--- 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 &&