[gentoo-commits] proj/eselect-php:master commit in: openrc/, /, doc/

[gentoo-commits] proj/eselect-php:master commit in: openrc/, /, doc/

[Michael Orlitzky]

commit:     66fee3ec3c7a8cea2332123c6a772d1bc0e35dda
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 23:45:42 2017 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 23:45:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=66fee3ec

Rename OpenRC init script and config file.

The OpenRC init script is now installed by the Makefile, so to be
useful it needs to be called "php-fpm". To that end, I've renamed both
the init script and the config file to lack the word
"example". Moreover, now that these files are code-like and not
documentation-like, I've renamed the directory containing them from
"doc" to "openrc".

 .gitignore                                             | 4 ++--
 Makefile.am                                            | 6 +++---
 configure.ac                                           | 2 +-
 doc/php-fpm.example.conf => openrc/php-fpm.conf        | 0
 doc/php-fpm.example.init.in.in => openrc/php-fpm.in.in | 0
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9561ed8..ab72e36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@ autom4te.cache/
 config.log
 config.status
 configure
-doc/php-fpm.example.init
-doc/php-fpm.example.init.in
+openrc/php-fpm
+openrc/php-fpm.in
 install-sh
 missing
 src/php.eselect

diff --git a/Makefile.am b/Makefile.am
index eb3b89b..2b3bf67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
 initdir = $(sysconfdir)/init.d
-nodist_init_DATA = $(srcdir)/doc/php-fpm.example.init
+nodist_init_DATA = $(srcdir)/openrc/php-fpm
 
 # Without EXTRA_DIST, these files don't wind up in the tarball.
-EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in doc/*.*
+EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in openrc/*.*
 
 if APACHE2
   # Without these set, we won't try to install the conf file.
@@ -30,4 +30,4 @@ $(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_DATA): Makefile
 
 $(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in
 $(srcdir)/src/70_mod_php.conf: $(srcdir)/src/70_mod_php.conf.in
-$(srcdir)/doc/php-fpm.example.init: $(srcdir)/doc/php-fpm.example.init.in
+$(srcdir)/openrc/php-fpm: $(srcdir)/openrc/php-fpm.in

diff --git a/configure.ac b/configure.ac
index c7702d5..5e6ccfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,6 @@ AC_ARG_WITH(piddir, AC_HELP_STRING([--with-piddir=DIR],
 AC_SUBST(piddir)
 
 # List of output files.
-AC_CONFIG_FILES([Makefile src/php.eselect.in doc/php-fpm.example.init.in])
+AC_CONFIG_FILES([Makefile src/php.eselect.in openrc/php-fpm.in])
 
 AC_OUTPUT

diff --git a/doc/php-fpm.example.conf b/openrc/php-fpm.conf
similarity index 100%
rename from doc/php-fpm.example.conf
rename to openrc/php-fpm.conf

diff --git a/doc/php-fpm.example.init.in.in b/openrc/php-fpm.in.in
similarity index 100%
rename from doc/php-fpm.example.init.in.in
rename to openrc/php-fpm.in.in