Changeset 627 for branches/1.3/Makefile.frag

Timestamp:

2009-07-05T11:24:38+02:00 (4 years ago)

Author:

moo

Message:

merged r585:592 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• Makefile.frag (modified) (2 diffs)

branches/1.3/Makefile.frag

@@ -15 +15 @@
 
 $(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO_OUT) $(XCACHE_PROC_SOURCES)
-    $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
+    $(M4) -D srcdir='`'"$(srcdir)'" -D builddir='`'"$(builddir)'" $(XCACHE_ENABLE_TEST) $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp
     mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT)
 
@@ -39 +39 @@
 
 xcachetest:
+    $(SED) "s#\\./modules/#$(top_builddir)/modules/#" < $(srcdir)/xcache-test.ini > $(top_builddir)/tmp-php.ini
     TEST_PHP_SRCDIR=$(top_srcdir) \
     CC="$(CC)" \
-        $(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
+        $(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