From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 5 Oct 2014 14:15:06 +0000 (+0200)
Subject: Rename pdns init script to pdns.init
X-Git-Tag: rec-3.7.0-rc1~218^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd42e98fe656dd3a0223316c828e694746002feb;p=thirdparty%2Fpdns.git

Rename pdns init script to pdns.init
---

diff --git a/Makefile.am b/Makefile.am
index 270b912a04..1fd06aa2c0 100644
--- 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 e9c1d8341a..1fa1dd83bc 100755
--- 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 80c24035e3..9028cfe7b7 100644
--- 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 d0554c6557..c92279bffb 100755
--- 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 96f8b4054a..eee58ed4a2 100644
--- 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 0358c8f2ab..6d2a6e96c0 100644
--- 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