Skip to content

Commit 9c423af

Browse files
tony2001tony2001
committed
various configure & build improvements
1 parent f5747f4 commit 9c423af

File tree

2 files changed

+77
-15
lines changed

2 files changed

+77
-15
lines changed

‎sapi/fpm/Makefile.frag

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,47 @@
1+
fpm: $(SAPI_FPM_PATH)
2+
13
$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
24
$(BUILD_FPM)
5+
6+
install: install-fpm
7+
8+
install-fpm: all
9+
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(php_fpm_bin_path)"
10+
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_bin_dir)
11+
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir)
12+
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_log_dir)
13+
@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(php_fpm_bin_path)$(program_suffix)$(EXEEXT)
14+
15+
@test "$(php_fpm_conf)" && \
16+
echo "Installing PHP FPM config: $(INSTALL_ROOT)$(php_fpm_conf_path)" && \
17+
$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_conf_dir) || :
18+
19+
@test "$(php_fpm_conf)" && \
20+
test -f "$(INSTALL_ROOT)$(php_fpm_conf_path)" && \
21+
$(INSTALL_DATA) --backup=numbered $(INSTALL_ROOT)$(php_fpm_conf_path) $(INSTALL_ROOT)$(php_fpm_conf_path).old || :
22+
23+
@test "$(php_fpm_conf)" && \
24+
$(INSTALL_DATA) sapi/fpm/conf/php-fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default && \
25+
ln -sf $(INSTALL_ROOT)$(php_fpm_conf_path).default $(INSTALL_ROOT)$(php_fpm_conf_path) || :
26+
27+
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1"
28+
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
29+
@$(INSTALL_DATA) sapi/fpm/$(php_fpm_bin).1 $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1
30+
31+
@test -d /etc/nginx/ && \
32+
echo "Installing NGINX sample config: /etc/nginx/nginx-site-conf.sample" && \
33+
$(mkinstalldirs) $(INSTALL_ROOT)/etc/nginx && \
34+
$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample $(INSTALL_ROOT)/etc/nginx/nginx-site-conf.sample || :
35+
36+
@test -d /usr/local/etc/nginx/ && \
37+
echo "Installing NGINX sample config: /usr/local/etc/nginx/nginx-site-conf.sample" && \
38+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/etc/nginx && \
39+
$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample $(INSTALL_ROOT)/usr/local/etc/nginx/nginx-site-conf.sample || :
40+
41+
@test -d /usr/local/nginx/conf/ && \
42+
echo "Installing NGINX sample config: /usr/local/nginx/conf/nginx-site-conf.sample" && \
43+
$(mkinstalldirs) $(INSTALL_ROOT)/usr/local/nginx/conf && \
44+
$(INSTALL_DATA) -b sapi/fpm/nginx-site-conf.sample $(INSTALL_ROOT)/usr/local/nginx/conf/nginx-site-conf.sample || :
45+
46+
@echo "" || :
47+

‎sapi/fpm/config.m4

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -510,16 +510,16 @@ dnl configure options {{{
510510
AC_DEFUN([AC_FPM_ARGS],
511511
[
512512
PHP_ARG_WITH(fpm-bin,,
513-
[ --with-fpm-bin[=PATH] Set the path for php-fpm binary. (default: /usr/local/bin/php-fpm)], /usr/local/bin/php-fpm, no)
513+
[ --with-fpm-bin[=PATH] Set the path for php-fpm binary. (default: \$bindir/php-fpm)], yes, no)
514514
515515
PHP_ARG_WITH(fpm-conf,,
516-
[ --with-fpm-conf[=PATH] Set the path for php-fpm configuration file. (default: /etc/php-fpm.conf)], /etc/php-fpm.conf, no)
516+
[ --with-fpm-conf[=PATH] Set the path for php-fpm configuration file. (default: \$sysconfdir/php-fpm.conf)], yes, no)
517517
518518
PHP_ARG_WITH(fpm-log,,
519-
[ --with-fpm-log[=PATH] Set the path for php-fpm log file. (default: /var/log/php-fpm.log)], /var/log/php-fpm.log, no)
519+
[ --with-fpm-log[=PATH] Set the path for php-fpm log file. (default: /var/log/php-fpm.log)], yes, no)
520520
521521
PHP_ARG_WITH(fpm-pid,,
522-
[ --with-fpm-pid[=PATH] Set the path for php-fpm pid file. (default: /var/run/php-fpm.pid)], /var/run/php-fpm.pid, no)
522+
[ --with-fpm-pid[=PATH] Set the path for php-fpm pid file. (default: /var/run/php-fpm.pid)], yes, no)
523523
524524
PHP_ARG_WITH(fpm-user,,
525525
[ --with-fpm-user[=USER] Set the user for php-fpm to run as. (default: nobody)], nobody, no)
@@ -531,39 +531,51 @@ AC_DEFUN([AC_FPM_ARGS],
531531

532532
AC_DEFUN([AC_FPM_VARS],
533533
[
534-
if test -z "$PHP_FPM_BIN" -o "$with_fpm_bin" = "yes" -o "$with_fpm_bin" = "no"; then
535-
php_fpm_bin_path="$fpm_prefix/bin/php-fpm"
534+
if test -z "$PHP_FPM_BIN" -o "$PHP_FPM_BIN" = "yes" -o "$PHP_FPM_BIN" = "no"; then
535+
php_fpm_bin_path="$bindir/php-fpm"
536536
else
537537
php_fpm_bin_path="$PHP_FPM_BIN"
538538
fi
539+
php_fpm_bin_dir=`dirname $php_fpm_bin_path`
539540
php_fpm_bin=`basename $php_fpm_bin_path`
540541
541-
if test -z "$PHP_FPM_CONF" -o "$with_fpm_conf" = "yes" -o "$with_fpm_conf" = "no"; then
542-
php_fpm_conf_path="/etc/php-fpm.conf"
542+
if test -z "$PHP_FPM_CONF" -o "$PHP_FPM_CONF" = "yes"; then
543+
php_fpm_conf_path="$sysconfdir/php-fpm.conf"
544+
elif test "$PHP_FPM_CONF" = "no"; then
545+
php_fpm_conf_path=""
543546
else
544547
php_fpm_conf_path="$PHP_FPM_CONF"
545548
fi
546-
php_fpm_conf=`basename $php_fpm_conf_path`
547549
548-
if test -z "$PHP_FPM_LOG" -o "$with_fpm_log" = "yes" -o "$with_fpm_log" = "no"; then
550+
if test -z "$php_fpm_conf_path"; then
551+
php_fpm_conf=""
552+
php_fpm_conf_dir=""
553+
else
554+
php_fpm_conf=`basename $php_fpm_conf_path`
555+
php_fpm_conf_dir=`dirname $php_fpm_conf_path`
556+
fi
557+
558+
if test -z "$PHP_FPM_LOG" -o "$PHP_FPM_LOG" = "yes" -o "$PHP_FPM_LOG" = "no"; then
549559
php_fpm_log_path="/var/log/php-fpm.log"
550560
else
551561
php_fpm_log_path="$PHP_FPM_LOG"
552562
fi
563+
php_fpm_log_dir=`dirname $php_fpm_log_path`
553564
554-
if test -z "$PHP_FPM_PID" -o "$with_fpm_pid" = "yes" -o "$with_fpm_pid" = "no"; then
565+
if test -z "$PHP_FPM_PID" -o "$PHP_FPM_PID" = "yes" -o "$PHP_FPM_PID" = "no"; then
555566
php_fpm_pid_path="/var/run/php-fpm.pid"
556567
else
557568
php_fpm_pid_path="$PHP_FPM_PID"
558569
fi
570+
php_fpm_pid_dir=`dirname $php_fpm_pid_path`
559571
560-
if test -z "$PHP_FPM_USER" -o "$with_fpm_user" = "yes" -o "$with_fpm_user" = "no"; then
572+
if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
561573
php_fpm_user="nobody"
562574
else
563575
php_fpm_user="$PHP_FPM_USER"
564576
fi
565577
566-
if test -z "$PHP_FPM_GROUP" -o "$with_fpm_group" = "yes" -o "$with_fpm_group" = "no"; then
578+
if test -z "$PHP_FPM_GROUP" -o "$PHP_FPM_GROUP" = "yes" -o "$PHP_FPM_GROUP" = "no"; then
567579
php_fpm_group="nobody"
568580
else
569581
php_fpm_group="$PHP_FPM_GROUP"
@@ -573,9 +585,14 @@ AC_DEFUN([AC_FPM_VARS],
573585
PHP_SUBST_OLD(fpm_version)
574586
PHP_SUBST_OLD(php_fpm_bin)
575587
PHP_SUBST_OLD(php_fpm_bin_path)
588+
PHP_SUBST_OLD(php_fpm_conf)
576589
PHP_SUBST_OLD(php_fpm_conf_path)
577590
PHP_SUBST_OLD(php_fpm_log_path)
578591
PHP_SUBST_OLD(php_fpm_pid_path)
592+
PHP_SUBST_OLD(php_fpm_bin_dir)
593+
PHP_SUBST_OLD(php_fpm_conf_dir)
594+
PHP_SUBST_OLD(php_fpm_log_dir)
595+
PHP_SUBST_OLD(php_fpm_pid_dir)
579596
PHP_SUBST_OLD(php_fpm_user)
580597
PHP_SUBST_OLD(php_fpm_group)
581598
@@ -650,8 +667,8 @@ if test "$PHP_FPM" != "no"; then
650667

651668
SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
652669
PHP_SUBST(SAPI_EXTRA_LIBS)
653-
654-
INSTALL_IT="@echo \"Installing PHP FPM binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_FPM_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-fpm\$(program_suffix)\$(EXEEXT); echo \"Installing PHP FPM man page: \$(INSTALL_ROOT)\$(mandir)/man1/\"; \$(mkinstalldirs) \$(INSTALL_ROOT)\$(mandir)/man1; \$(INSTALL_DATA) \$(builddir)/sapi/fpm/php-fpm.1 \$(INSTALL_ROOT)\$(mandir)/man1/\$(program_prefix)php-fpm\$(program_suffix).1"
670+
671+
INSTALL_IT=":"
655672
PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
656673

657674
case $host_alias in

0 commit comments

Comments
 (0)