cvs: php4 / configure.in /build/ rules.mk /ext/java/ Makefile.in /sapi/servlet/ Makefile.in

sas Mon May 15 18:02:43 2000 EDT Modified files: /php4 configure.in /php4/build rules.mk /php4/ext/java Makefile.in /php4/sapi/servlet Makefile.in Log: Use "mkdir -p" instead of "test -d || mkdir" where possible Index: php4/configure.in diff -u php4/configure.in:1.124 php4/configure.in:1.125 --- php4/configure.in:1.124 Sun May 7 06:42:04 2000 +++ php4/configure.in Mon May 15 18:02:42 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.124 2000/05/07 04:42:04 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.125 2000/05/15 16:02:42 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -7,13 +7,6 @@ PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile) -dnl Because ``make install'' is often performed by the superuser, -dnl we create the libs subdirectory as the user who configures PHP. -dnl Otherwise, the current user will not be able to delete libs -dnl or the contents of libs. -test -d libs || mkdir libs -rm -f libs/* - if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS) fi @@ -34,6 +27,14 @@ T_MD=$php_shtool echo -n -e %B T_ME=$php_shtool echo -n -e %b +dnl Because ``make install'' is often performed by the superuser, +dnl we create the libs subdirectory as the user who configures PHP. +dnl Otherwise, the current user will not be able to delete libs +dnl or the contents of libs. + +$php_shtool mkdir -p libs +rm -f libs/* + dnl ## Diversion 2 is the initial checking of OS features, programs, dnl ## libraries and so on. @@ -179,7 +180,7 @@ dnl and source packages. This should be harmless on other OSs. dnl if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then - CFLAGS="$CFLAGS -I/usr/pkg/include" + CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" LDFLAGS="$LDFLAGS -L/usr/pkg/lib" fi @@ -661,7 +662,7 @@ phplibdir="pwd/modules" -test -d $phplibdir || mkdir $phplibdir +$php_shtool mkdir -p $phplibdir phptempdir="pwd/libs" test "$prefix" = "NONE" && prefix="/usr/local" Index: php4/build/rules.mk diff -u php4/build/rules.mk:1.13 php4/build/rules.mk:1.14 --- php4/build/rules.mk:1.13 Thu May 4 19:50:32 2000 +++ php4/build/rules.mk Mon May 15 18:02:42 2000 @@ -21,7 +21,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: rules.mk,v 1.13 2000/05/04 17:50:32 sas Exp $ +# $Id: rules.mk,v 1.14 2000/05/15 16:02:42 sas Exp $ # include $(top_builddir)/config_vars.mk @@ -30,7 +30,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -mkinstalldirs = $(top_srcdir)/build/shtool mkdir -f -p +mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< && touch $@ Index: php4/ext/java/Makefile.in diff -u php4/ext/java/Makefile.in:1.12 php4/ext/java/Makefile.in:1.13 --- php4/ext/java/Makefile.in:1.12 Tue May 2 00:38:29 2000 +++ php4/ext/java/Makefile.in Mon May 15 18:02:42 2000 @@ -14,8 +14,7 @@ include $(top_srcdir)/build/dynlib.mk php_java.jar : reflect.java - @test -d net || mkdir net - @test -d net/php || mkdir net/php + $(mkinstalldirs) net/php @cp $(srcdir)/reflect.java net/php @echo library=php_java>net/php/reflect.properties javac net/php/reflect.java Index: php4/sapi/servlet/Makefile.in diff -u php4/sapi/servlet/Makefile.in:1.15 php4/sapi/servlet/Makefile.in:1.16 --- php4/sapi/servlet/Makefile.in:1.15 Tue May 2 00:38:37 2000 +++ php4/sapi/servlet/Makefile.in Mon May 15 18:02:43 2000 @@ -12,8 +12,7 @@ @cp ../../ext/java/java.c . phpsrvlt.jar : servlet.java ../../ext/java/reflect.java - @test -d net || mkdir net - @test -d net/php || mkdir net/php + $(mkinstalldirs) net/php @echo library=php4>net/php/reflect.properties @echo library=php4>net/php/servlet.properties @cp formatter.java net/php