Changeset b21f393 in git


Ignore:
Timestamp:
2013-09-25T03:09:48Z (6 years ago)
Author:
Xuefer <xuefer@…>
Branches:
3.0
Children:
6ab942b
Parents:
53cc8d9
Message:

merge devel stuffs from trunk

git-svn-id: svn://svn.lighttpd.net/xcache/branches/3.0@1397 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile.frag

    r9016119 rb21f393  
    3131
    3232xcachetest: all
    33     $(SED) "s#\\./modules/#$(top_builddir)/modules/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini
    34     TEST_PHP_SRCDIR=$(srcdir) $(srcdir)/run-xcachetest $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini
     33    $(SED) "s#\\./\\.libs/#$(top_builddir)/\\.libs/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini
     34    if test -z "$(TESTS)"; then \
     35        TEST_PHP_SRCDIR=$(srcdir) $(srcdir)/run-xcachetest $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini; \
     36    fi
    3537    $(srcdir)/run-xcachetest $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini
Note: See TracChangeset for help on using the changeset viewer.