diff options
| author | Jani Taskinen <jani@php.net> | 2010-11-13 23:13:07 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-11-13 23:13:07 +0000 |
| commit | 25aee9cad951b018d615c069373325160847cd4a (patch) | |
| tree | da977ad05055cc4e39fd7592b74c4e8a7b1a034e /sapi/fpm/Makefile.frag | |
| parent | 200dcee22d9790944dbb4f83efef51963a3b35bb (diff) | |
| download | php-git-25aee9cad951b018d615c069373325160847cd4a.tar.gz | |
- Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)
# Bug #53271, Bug #52410
Diffstat (limited to 'sapi/fpm/Makefile.frag')
| -rw-r--r-- | sapi/fpm/Makefile.frag | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sapi/fpm/Makefile.frag b/sapi/fpm/Makefile.frag index 0859ef10ca..6da67f952e 100644 --- a/sapi/fpm/Makefile.frag +++ b/sapi/fpm/Makefile.frag @@ -1,16 +1,9 @@ fpm: $(SAPI_FPM_PATH) -$(builddir)/fpm: - @mkdir -p $(builddir)/fpm - -$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS) +$(SAPI_FPM_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FPM_OBJS) $(BUILD_FPM) -$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h - -install-build: install-fpm - -install-fpm: install-sapi +install-fpm: $(SAPI_FPM_PATH) @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log @@ -19,7 +12,6 @@ install-fpm: install-sapi @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || : - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" |