Ignore:
Timestamp:
2013-09-25T05:09:48+02:00 (13 months ago)
Author:
moo
Message:

merge devel stuffs from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.0/Makefile.frag

    r1015 r1397  
    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.