| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
|
|
|
|
| |
Signed-off-by: Brian Evans <grknight@gentoo.org>
|
|
|
|
|
|
| |
This change is suggested by "autoupdate" with autoconf-2.71.
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
|
|
|
|
| |
Signed-off-by: Brian Evans <grknight@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When performing an out-of-source build (in particular, with "make
distcheck"), the rules that we were using to replace @LIBDIR@ and
friends were failing. Automake does a lot of path magic in its rules,
but not within the shell commands themselves, so ultimately we wound
up with some confusion between the source and build directories.
Rather than hack around this problem in the top-level Makefile.am,
I've converted the project to a recursive build, where the top-level
Makefile.am delegates to Makefile.am in the subdirectories. This
over-complicates things, but does fix the out-of-source build. Why?
A guess: because the path magic works better in "." than elsewhere.
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
|
|
|
|
| |
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
The default tar format used by autotools is the historical v7 format,
which sucks. Let's use the improved "ustar" format instead. The
automake documentation has more information if this is the sort of
thing that interests you.
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
During the build, autotools generates a bunch of files that need a
place to live. By default, most of them (the "missing" script, for
example) wind up in the project root. This commit sets
AC_CONFIG_AUX_DIR([build-aux])
in configure.ac so that the aforementioned files are placed in the
build-aux directory instead.
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
|
| |
|
| |
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
|
|
|
| |
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".
|
| |
|
|
|
|
|
|
|
| |
Our php-fpm init script defaulted to using /run for its pid file, but
now that is configurable via the --with-piddir flag. Its value
defaults to @LOCALSTATEDIR@ and the variable substitution should work
whether or not --with-piddir is set explicitly.
|
|
|
|
|
|
|
|
| |
We perform variable substitution twice in the main eselect script --
once through autotools, and the other manually in the resulting
Makefile. As a result, the script has a double "in.in" suffix. To make
substitution work the same way in the init script, this commit renames
it with an "in.in" suffix, and mentions it in configure.ac.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
The latest eselect-php ebuild allows users to avoid 70_mod_php.conf by
setting USE="-apache2". Now that the conf file is part of eselect-php,
we replicate that ability with --enable-apache2=no, or in fact by
default. To install the apache conf file, one passes --enable-apache2
to the configure script.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When we create php.eselect from php.eselect.in using autoconf, we
don't have a way to get the full, expanded value of @bindir@,
@libdir@, and the other paths that we need. The autoconf documentation
suggests a workaround for this: add another layer of indirection, and
use the Makefile to substitute those values into the output files.
This commit sets the stage by renaming php.eselect.in to
php.eselect.in.in. The first round of processing by autoconf takes
php.eselect.in.in to php.eselect.in. The Makefile will then generate
php.eselect from php.eselect.in after substituting @bindir@, @libdir@,
and @localstatedir@.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|