cvs: php4 /build build.mk

imajes Thu Jun 20 04:21:22 2002 EDT Modified files: /php4/build build.mk Log: fixing to permit builds with ZE2 Index: php4/build/build.mk diff -u php4/build/build.mk:1.11 php4/build/build.mk:1.12 --- php4/build/build.mk:1.11 Thu Feb 28 03:25:29 2002 +++ php4/build/build.mk Thu Jun 20 04:21:20 2002 @@ -14,13 +14,13 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build.mk,v 1.11 2002/02/28 08:25:29 sebastian Exp $ +# $Id: build.mk,v 1.12 2002/06/20 08:21:20 imajes Exp $ # # # Makefile to generate build tools # -SUBDIRS = Zend TSRM +ZENDDIR = $(shell if test -d "ZendEngine2"; then echo ZendEngine2; else echo Zend; fi) STAMP = buildmk.stamp @@ -30,11 +30,11 @@ @$(MAKE) AMFLAGS=$(AMFLAGS) -s -f build/build2.mk generated_lists: - @echo makefile_am_files = Zend/Makefile.am \ + @echo makefile_am_files = $(ZENDDIR)/Makefile.am \ TSRM/Makefile.am > $@ - @echo config_h_files = Zend/acconfig.h TSRM/acconfig.h >> $@ - @echo config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \ - Zend/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@ + @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@ + @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \ + $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@ $(STAMP): build/buildcheck.sh @build/buildcheck.sh && touch $(STAMP) @@ -66,6 +66,5 @@ @for i in find . -name .cvsignore; do \ (cd dirname $$i 2>/dev/null && rm -rf cat .cvsignore *.o *.a || true); \ done - @rm -f $(SUBDIRS) 2>/dev/null || true .PHONY: $(ALWAYS) snapshot cvsclean