diff options
| author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:01:44 +0200 |
|---|---|---|
| committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:01:44 +0200 |
| commit | cf0303e7824c3e20e9db240f9d4e4b154cc2a72d (patch) | |
| tree | 89aa4aab62b422615a7441552b3a0176b22b2b0d /sapi/thttpd | |
| parent | 25f5ba94aca1e89ee5f0c66513e58826afa3b853 (diff) | |
| download | php-git-cf0303e7824c3e20e9db240f9d4e4b154cc2a72d.tar.gz | |
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'sapi/thttpd')
| -rw-r--r-- | sapi/thttpd/config.m4 | 4 | ||||
| -rw-r--r-- | sapi/thttpd/thttpd_patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4 index 371edaee84..fddb709d92 100644 --- a/sapi/thttpd/config.m4 +++ b/sapi/thttpd/config.m4 @@ -25,10 +25,10 @@ if test "$PHP_THTTPD" != "no"; then fi PHP_TARGET_RDYNAMIC INSTALL_IT="\ - echo 'PHP_LIBS = -L. -lphp5 \$(PHP_LIBS) \$(EXTRA_LIBS)' > $THTTPD/php_makefile; \ + echo 'PHP_LIBS = -L. -lphp7 \$(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/php_thttpd.h $THTTPD/libphp5.a; \ + rm -f $THTTPD/php_thttpd.c $THTTPD/php_thttpd.h $THTTPD/libphp7.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/;\ $patch" diff --git a/sapi/thttpd/thttpd_patch b/sapi/thttpd/thttpd_patch index 33de921489..c79ee44e62 100644 --- a/sapi/thttpd/thttpd_patch +++ b/sapi/thttpd/thttpd_patch @@ -34,7 +34,7 @@ diff -ur thttpd-2.21b/Makefile.in thttpd-2.21b-cool/Makefile.in this: $(ALL) -thttpd: $(OBJ) -+thttpd: $(OBJ) libphp5.a ++thttpd: $(OBJ) libphp7.a @rm -f $@ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS) $(NETLIBS) |