Changeset 22aaf97 in git for Makefile.frag


Ignore:
Timestamp:
2009-07-05T09:24:38Z (10 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.3
Children:
a0a3bd9
Parents:
225afd2
Message:

merged r585:592 from trunk

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile.frag

    rb71b640 r22aaf97  
    1515
    1616$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)
    17     $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
     17    $(M4) -D srcdir='`'"$(srcdir)'" -D builddir='`'"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
    1818    mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)
    1919
     
    3939
    4040xcachetest:
     41    $(SED) "s#\\./modules/#$(top_builddir)/modules/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini
    4142    TEST_PHP_SRCDIR=$(top_srcdir) \
    4243    CC="$(CC)" \
    43         $(srcdir)/run-xcachetest -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(srcdir)/xcache-test.ini
     44        $(srcdir)/run-xcachetest -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS) $(TEST_ARGS) -c $(top_builddir)/tmp-php.ini
Note: See TracChangeset for help on using the changeset viewer.