Rename pdns init script to pdns.init

diff --git a/Makefile.am b/Makefile.am
index 270b912a0458862e6c34159e9ec9dc429211e9c9..1fd06aa2c0358e9798e9a6566f1c004cc62e1178 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,10 +25,10 @@ pdns/docs/dnsdist.1:
        cd pdns/docs && $(MAKE) dnsdist.1
 
 install-exec-local: 
-       -@chmod +x pdns/pdns
+       -@chmod +x pdns/pdns.init
        @echo "***********************************************************"
        @echo
-       @echo An init.d startup script has been made for you in pdns/pdns.
+       @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 "***********************************************************"

diff --git a/build-scripts/rpm-build-instruction b/build-scripts/rpm-build-instruction
index e9c1d8341a047928c1c208d6147bfd7849ae428a..1fa1dd83bcd61ad34d13b92e090258ebaedaba72 100755 (executable)
--- a/build-scripts/rpm-build-instruction
+++ b/build-scripts/rpm-build-instruction
@@ -12,7 +12,7 @@ CC="ccache gcc" CXX="ccache g++" CPPFLAGS=-I/usr/local/include/botan-1.10 ./conf
 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 /tmp/pdns/etc/init.d/pdns &&
+fakeroot cp 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 &&

diff --git a/configure.ac b/configure.ac
index 80c24035e320d2f81f6940104dae9c0208599c95..9028cfe7b73b790abb337c375db31cd4854f8428 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -354,7 +354,7 @@ AC_CONFIG_FILES([
   modules/Makefile
   pdns/Makefile
   codedocs/Makefile
-  pdns/pdns
+  pdns/pdns.init
   pdns/ext/Makefile
   pdns/ext/yahttp/Makefile
   pdns/ext/yahttp/yahttp/Makefile

diff --git a/debian-pdns/rules b/debian-pdns/rules
index d0554c65577472dfe5b4004c9a71b52a990ae9f2..c92279bffb536dbfbc328b88f1d415314d7a940a 100755 (executable)
--- a/debian-pdns/rules
+++ b/debian-pdns/rules
@@ -96,7 +96,7 @@ binary-main-prepare:
        mv "$(tmpdir)"/etc/powerdns/pdns.conf-dist "$(tmpdir)"/etc/powerdns/pdns.conf
 
        install -d -m 755 -o root -g root "$(tmpdir)"/etc/init.d
-       install -p -m 755 -o root -g root pdns/pdns \
+       install -p -m 755 -o root -g root pdns/pdns.init \
                "$(tmpdir)"/etc/init.d/pdns
 
        install -d -m 755 -o root -g root \

diff --git a/pdns/.gitignore b/pdns/.gitignore
index 96f8b4054ab4bf36cca9ccde4d057daf08484a3b..eee58ed4a2ab4a79dcede1fc55a21c86e5dbb227 100644 (file)
--- a/pdns/.gitignore
+++ b/pdns/.gitignore
@@ -3,7 +3,7 @@
 /buildroot.sh
 /config.h
 /mkbindist
-/pdns
+/pdns.init
 /showvar
 /stamp-h
 /pdns_control

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 0358c8f2ab6274ce6a56dfabd3306064c24c138b..6d2a6e96c09b0dc8b7179c7fa4c6291879fe8382 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS= ext
 BUILT_SOURCES=bind-dnssec.schema.sqlite3.sql.h version_generated.h bindparser.h
 CLEANFILES=version_generated.h
 
-noinst_SCRIPTS = pdns
+noinst_SCRIPTS = pdns.init
 sysconf_DATA = pdns.conf-dist 
 
 sbin_PROGRAMS = pdns_server 

diff --git a/pdns/pdns.in b/pdns/pdns.init.in
similarity index 100%
rename from pdns/pdns.in
rename to pdns/pdns.init.in