improve portability

diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index 5cdb446f5e8f7afe55b198ed70ade1f7b1c9e1f1..bc0ffa9401744c58160b93252a2ce1aaa554ee5f 100644 (file)
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -18,10 +18,11 @@ AC_ARG_WITH(thttpd,
     echo 'PHP_LIBS = -L. -lphp4 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \
     echo 'PHP_LDFLAGS = \$(NATIVE_RPATHS) \$(PHP_LDFLAGS)' >> $THTTPD/php_makefile; \
     echo 'PHP_CFLAGS = \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(CPPFLAGS) \$(EXTRA_CFLAGS)' >> $THTTPD/php_makefile; \
+    rm -f $THTTPD/php_thttpd.c $THTTPD/thttpd.c $THTTPD/libphp4.a; \
     \$(LN_S) $abs_srcdir/sapi/thttpd/thttpd.c $THTTPD/php_thttpd.c; \
     \$(LN_S) $abs_srcdir/sapi/thttpd/php_thttpd.h $abs_builddir/$SAPI_STATIC $THTTPD/;\
     test -f $THTTPD/php_patched || \
-    (cd $THTTPD && patch < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)"
+    (cd $THTTPD && patch -p 1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)"
   PHP_THTTPD="yes, using $THTTPD"
   PHP_ADD_INCLUDE($THTTPD)
   PHP_SELECT_SAPI(thttpd, static)