| 1 |
commit: b341d98c011d3a829c2a5b40a6c5b83680d6d98e |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 22 23:21:45 2020 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 23 15:05:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=b341d98c |
| 7 |
|
| 8 |
Makefile.am: remove redundant $(srcdir)s. |
| 9 |
|
| 10 |
The $(srcdir) in Makefile.am is implicit. Let's keep it that way. |
| 11 |
|
| 12 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 13 |
|
| 14 |
Makefile.am | 32 ++++++++++++++++---------------- |
| 15 |
1 file changed, 16 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/Makefile.am b/Makefile.am |
| 18 |
index e425c84..df6430a 100644 |
| 19 |
--- a/Makefile.am |
| 20 |
+++ b/Makefile.am |
| 21 |
@@ -1,33 +1,33 @@ |
| 22 |
eselectdir = $(datadir)/eselect/modules |
| 23 |
-nodist_eselect_DATA = $(srcdir)/src/php.eselect |
| 24 |
+nodist_eselect_DATA = src/php.eselect |
| 25 |
|
| 26 |
# Without EXTRA_DIST, these files don't wind up in the tarball. |
| 27 |
-EXTRA_DIST = $(srcdir)/openrc \ |
| 28 |
- $(srcdir)/src/70_mod_php.conf.in \ |
| 29 |
- $(srcdir)/src/php-fpm-launcher.in \ |
| 30 |
- $(srcdir)/src/php-fpm.logrotate.in |
| 31 |
+EXTRA_DIST = openrc \ |
| 32 |
+ src/70_mod_php.conf.in \ |
| 33 |
+ src/php-fpm-launcher.in \ |
| 34 |
+ src/php-fpm.logrotate.in |
| 35 |
|
| 36 |
if APACHE2 |
| 37 |
# Without these set, we won't try to install the conf file. |
| 38 |
apacheconfdir = $(sysconfdir)/apache2/modules.d |
| 39 |
- nodist_apacheconf_DATA = $(srcdir)/src/70_mod_php.conf |
| 40 |
+ nodist_apacheconf_DATA = src/70_mod_php.conf |
| 41 |
endif |
| 42 |
|
| 43 |
if FPM |
| 44 |
# Same as the APACHE2 conditional. |
| 45 |
initdir = $(sysconfdir)/init.d |
| 46 |
- nodist_init_SCRIPTS = $(srcdir)/openrc/init.d/php-fpm |
| 47 |
+ nodist_init_SCRIPTS = openrc/init.d/php-fpm |
| 48 |
|
| 49 |
confdir = $(sysconfdir)/conf.d |
| 50 |
- nodist_conf_DATA = $(srcdir)/openrc/conf.d/php-fpm |
| 51 |
+ nodist_conf_DATA = openrc/conf.d/php-fpm |
| 52 |
|
| 53 |
- nodist_libexec_SCRIPTS = $(srcdir)/src/php-fpm-launcher |
| 54 |
+ nodist_libexec_SCRIPTS = src/php-fpm-launcher |
| 55 |
|
| 56 |
logrotatedir = $(sysconfdir)/logrotate.d |
| 57 |
- nodist_logrotate_DATA = $(srcdir)/src/php-fpm.logrotate |
| 58 |
+ nodist_logrotate_DATA = src/php-fpm.logrotate |
| 59 |
|
| 60 |
tmpfilesdir = $(prefix)/lib/tmpfiles.d |
| 61 |
- dist_tmpfiles_DATA = $(srcdir)/src/php-fpm.conf |
| 62 |
+ dist_tmpfiles_DATA = src/php-fpm.conf |
| 63 |
endif |
| 64 |
|
| 65 |
# The next few rules allow us to replace bindir, libdir, etc. |
| 66 |
@@ -48,8 +48,8 @@ $(nodist_eselect_DATA) $(nodist_apacheconf_DATA) $(nodist_init_SCRIPTS) $(nodist |
| 67 |
$(edit) $${srcdir}$@.in > $@.tmp |
| 68 |
mv $@.tmp $@ |
| 69 |
|
| 70 |
-$(srcdir)/src/php.eselect: $(srcdir)/src/php.eselect.in |
| 71 |
-$(srcdir)/src/php-fpm-launcher: $(srcdir)/src/php-fpm-launcher.in |
| 72 |
-$(srcdir)/src/php-fpm.logrotate: $(srcdir)/src/php-fpm.logrotate.in |
| 73 |
-$(srcdir)/src/70_mod_php.conf: $(srcdir)/src/70_mod_php.conf.in |
| 74 |
-$(srcdir)/openrc/init.d/php-fpm: $(srcdir)/openrc/init.d/php-fpm.in |
| 75 |
+src/php.eselect: src/php.eselect.in |
| 76 |
+src/php-fpm-launcher: src/php-fpm-launcher.in |
| 77 |
+src/php-fpm.logrotate: src/php-fpm.logrotate.in |
| 78 |
+src/70_mod_php.conf: src/70_mod_php.conf.in |
| 79 |
+openrc/init.d/php-fpm: openrc/init.d/php-fpm.in |
Archives