From 24b77433ba7a83847fda5a75663bf281a0b87c2a Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <mjo@gentoo.org>
Date: Wed, 26 Jul 2017 11:53:05 -0400
Subject: Use "init.d" and "conf.d" subdirectories of "openrc".

OpenRC's init and conf files need to be named the same, and so we hit
problems trying to store them both in the "openrc" directory. This
commit puts the conf file in a "conf.d" subdirectory and the init
script in an "init.d" subdirectory.
---
 Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 08359dc..1d3122a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ eselectdir = $(datadir)/eselect/modules
 nodist_eselect_DATA = $(srcdir)/src/php.eselect
 
 # Without EXTRA_DIST, these files don't wind up in the tarball.
-EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in openrc/*.*
+EXTRA_DIST = $(srcdir)/src/70_mod_php.conf.in openrc
 
 if APACHE2
   # Without these set, we won't try to install the conf file.
@@ -13,10 +13,10 @@ endif
 if FPM
   # Same as the APACHE2 conditional.
   initdir = $(sysconfdir)/init.d
-  nodist_init_SCRIPTS = $(srcdir)/openrc/php-fpm
+  nodist_init_SCRIPTS = $(srcdir)/openrc/init.d/php-fpm
 
   confdir = $(sysconfdir)/conf.d
-  nodist_conf_DATA = $(srcdir)/openrc/php-fpm.conf
+  nodist_conf_DATA = $(srcdir)/openrc/conf.d/php-fpm
 endif
 
 # The next few rules allow us to replace bindir, libdir, etc.
@@ -37,4 +37,4 @@ $(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_SCRIPTS): Makefil
 
 $(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in
 $(srcdir)/src/70_mod_php.conf: $(srcdir)/src/70_mod_php.conf.in
-$(srcdir)/openrc/php-fpm: $(srcdir)/openrc/php-fpm.in
+$(srcdir)/openrc/init.d/php-fpm: $(srcdir)/openrc/init.d/php-fpm.in
-- 
cgit v1.2.3-65-gdbad