Skip to content

Commit 719b45a

Browse files
tony2001tony2001
committed
less options, more working stuff
1 parent ce0a5e9 commit 719b45a

File tree

2 files changed

+22
-39
lines changed

2 files changed

+22
-39
lines changed

‎sapi/fpm/Makefile.frag

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@ $(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
66
install-build: install-fpm
77

88
install-fpm: install-sapi
9-
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(php_fpm_bin_dir)/"
10-
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_bin_dir)
9+
@echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(bindir)/"
10+
@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
1111
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_pid_dir)
1212
@$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_log_dir)
13-
@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(php_fpm_bin_path)$(program_suffix)$(EXEEXT)
13+
@$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROO)$(bindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT)
1414

15-
@test "$(php_fpm_conf)" && \
16-
echo "Installing PHP FPM config: $(INSTALL_ROOT)$(php_fpm_conf_dir)/" && \
15+
@echo "Installing PHP FPM config: $(INSTALL_ROOT)$(php_fpm_conf_dir)/" && \
1716
$(mkinstalldirs) $(INSTALL_ROOT)$(php_fpm_conf_dir) || :
1817

19-
@test "$(php_fpm_conf)" && \
20-
$(INSTALL_DATA) sapi/fpm/conf/php-fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_path).default || :
18+
@$(INSTALL_DATA) sapi/fpm/conf/php-fpm.conf $(INSTALL_ROOT)$(php_fpm_conf_dir)/php-fpm.conf.default || :
2119

2220
@echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man1/"
2321
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
24-
@$(INSTALL_DATA) sapi/fpm/$(php_fpm_bin).1 $(INSTALL_ROOT)$(mandir)/man1/$(php_fpm_bin)$(program_suffix).1
22+
@$(INSTALL_DATA) sapi/fpm/php-fpm.1 $(INSTALL_ROOT)$(mandir)/man1/php-fpm$(program_suffix).1
2523

‎sapi/fpm/config.m4

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,6 @@ dnl }}}
509509
dnl configure options {{{
510510
AC_DEFUN([AC_FPM_ARGS],
511511
[
512-
PHP_ARG_WITH(fpm-bin,,
513-
[ --with-fpm-bin[=PATH] Set the path for php-fpm binary. (default: \$bindir/php-fpm)], yes, no)
514-
515512
PHP_ARG_WITH(fpm-conf,,
516513
[ --with-fpm-conf[=PATH] Set the path for php-fpm configuration file. (default: \$sysconfdir/php-fpm.conf)], yes, no)
517514
@@ -531,28 +528,23 @@ AC_DEFUN([AC_FPM_ARGS],
531528

532529
AC_DEFUN([AC_FPM_VARS],
533530
[
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"
536-
else
537-
php_fpm_bin_path="$PHP_FPM_BIN"
538-
fi
539-
php_fpm_bin_dir=`dirname $php_fpm_bin_path`
540-
php_fpm_bin=`basename $php_fpm_bin_path`
541-
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
531+
if test -z "$PHP_FPM_CONF" -o "$PHP_FPM_CONF" = "yes" -o "$PHP_FPM_CONF" = "no"; then
545532
php_fpm_conf_path=""
546533
else
547534
php_fpm_conf_path="$PHP_FPM_CONF"
548535
fi
549536
550537
if test -z "$php_fpm_conf_path"; then
551-
php_fpm_conf=""
552-
php_fpm_conf_dir=""
538+
php_fpm_conf_path=`eval echo "$sysconfdir"`
539+
php_fpm_conf_path="$php_fpm_conf_path/php-fpm.conf"
540+
fi
541+
542+
if test -d "$php_fpm_conf_path"; then
543+
php_fpm_conf_dir="$php_fpm_conf"
544+
php_fpm_conf="$php_fpm_conf/php-fpm.conf"
553545
else
554-
php_fpm_conf=`basename $php_fpm_conf_path`
555546
php_fpm_conf_dir=`dirname $php_fpm_conf_path`
547+
php_fpm_conf=`basename $php_fpm_conf_path`
556548
fi
557549
558550
if test -z "$PHP_FPM_LOG" -o "$PHP_FPM_LOG" = "yes" -o "$PHP_FPM_LOG" = "no"; then
@@ -583,24 +575,17 @@ AC_DEFUN([AC_FPM_VARS],
583575
584576
585577
PHP_SUBST_OLD(fpm_version)
586-
PHP_SUBST_OLD(php_fpm_bin)
587-
PHP_SUBST_OLD(php_fpm_bin_path)
588-
PHP_SUBST_OLD(php_fpm_conf)
589-
PHP_SUBST_OLD(php_fpm_conf_path)
578+
PHP_SUBST_OLD(php_fpm_conf_dir)
590579
PHP_SUBST_OLD(php_fpm_log_path)
591580
PHP_SUBST_OLD(php_fpm_pid_path)
592-
PHP_SUBST_OLD(php_fpm_bin_dir)
593-
PHP_SUBST_OLD(php_fpm_conf_dir)
594581
PHP_SUBST_OLD(php_fpm_log_dir)
595582
PHP_SUBST_OLD(php_fpm_pid_dir)
596583
PHP_SUBST_OLD(php_fpm_user)
597584
PHP_SUBST_OLD(php_fpm_group)
598585
599-
600-
AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version])
601-
AC_DEFINE_UNQUOTED(PHP_FPM_BIN, "$php_fpm_bin", [fpm binary executable])
602-
AC_DEFINE_UNQUOTED(PHP_FPM_BIN_PATH, "$php_fpm_bin_path", [fpm bin file path])
586+
AC_DEFINE_UNQUOTED(PHP_FPM_CONF_DIR, "$php_fpm_conf_dir", [fpm conf file dir])
603587
AC_DEFINE_UNQUOTED(PHP_FPM_CONF_PATH, "$php_fpm_conf_path", [fpm conf file path])
588+
AC_DEFINE_UNQUOTED(PHP_FPM_VERSION, "$fpm_version", [fpm version])
604589
AC_DEFINE_UNQUOTED(PHP_FPM_LOG_PATH, "$php_fpm_log_path", [fpm log file path])
605590
AC_DEFINE_UNQUOTED(PHP_FPM_PID_PATH, "$php_fpm_pid_path", [fpm pid file path])
606591
AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
@@ -611,10 +596,10 @@ AC_DEFUN([AC_FPM_VARS],
611596

612597
AC_DEFUN([AC_FPM_OUTPUT],
613598
[
614-
PHP_OUTPUT(sapi/fpm/conf/$php_fpm_conf:sapi/fpm/conf/php-fpm.conf.in)
615-
PHP_OUTPUT(sapi/fpm/conf/init.d.$php_fpm_bin:sapi/fpm/conf/init.d.php-fpm.in)
599+
PHP_OUTPUT(sapi/fpm/conf/php-fpm.conf:sapi/fpm/conf/php-fpm.conf.in)
600+
PHP_OUTPUT(sapi/fpm/conf/init.d.php-fpm:sapi/fpm/conf/init.d.php-fpm.in)
616601
PHP_OUTPUT(sapi/fpm/conf/nginx-site-conf.sample:sapi/fpm/conf/nginx-site-conf.sample.in)
617-
PHP_OUTPUT(sapi/fpm/$php_fpm_bin.1:sapi/fpm/man/php-fpm.1.in)
602+
PHP_OUTPUT(sapi/fpm/php-fpm.1:sapi/fpm/man/php-fpm.1.in)
618603
])
619604

620605

@@ -653,7 +638,7 @@ if test "$PHP_FPM" != "no"; then
653638

654639
PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/fpm/Makefile.frag)
655640

656-
SAPI_FPM_PATH=sapi/fpm/$php_fpm_bin
641+
SAPI_FPM_PATH=sapi/fpm/php-fpm
657642
PHP_SUBST(SAPI_FPM_PATH)
658643

659644
mkdir -p sapi/fpm/fpm

0 commit comments

Comments
 (0)