diff options
| author | Sascha Schumann <sas@php.net> | 2001-04-09 15:47:19 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-04-09 15:47:19 +0000 |
| commit | 466c226415405a462af2ee61bbe46ea1eebea80c (patch) | |
| tree | dcbb25dc28cc76d2b73a7aadf9cba7aed0b730cd /Makefile.in | |
| parent | d85be2956ce1bec342e18772993634468232a9dc (diff) | |
| download | php-git-466c226415405a462af2ee61bbe46ea1eebea80c.tar.gz | |
Revert mega patch.
This patch has at least the following deficiences:
- the CGI is built using objects from another SAPI module.
This usually results in unsatisfied symbol references.
- the CGI makefile is not created properly
- building CGI cannot be disabled
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index b9969278a8..1009646508 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) PROGRAM_NAME = php PROGRAM_SOURCES = stub.c -PROGRAM_LDADD = $(CGI_LDADD) libphp4.la $(EXT_PROGRAM_LDADD) +PROGRAM_LDADD = libphp4.la $(EXT_PROGRAM_LDADD) PROGRAM_LDFLAGS = -export-dynamic PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD) @@ -41,7 +41,6 @@ install-sapi: fi; \ done; \ fi - $(INSTALL_CGI) $(INSTALL_IT) install-modules: @@ -51,13 +50,7 @@ install-modules: rm -f modules/*.la && \ cp modules/* $(INSTALL_ROOT)$(moduledir) >/dev/null 2>&1 || true -install-tester: - -$(mkinstalldirs) $(bindir) - $(INSTALL) -m 755 $(srcdir)/run-tests.php $(PEAR_INSTALLDIR)/. - -install-pear: install-modules +install-su: install-modules (cd pear && $(MAKE) install) -install-su: install-pear install-tester - .NOEXPORT: |