You are viewing a plain text version of this content. The canonical link for it is here.
Posted to apreq-cvs@httpd.apache.org by jo...@apache.org on 2004/12/06 16:21:48 UTC
svn commit: r109980 - /httpd/apreq/trunk/env/Makefile.am
Author: joes
Date: Mon Dec 6 07:21:47 2004
New Revision: 109980
URL: http://svn.apache.org/viewcvs?view=rev&rev=109980
Log:
OS X's (g)libtool has trouble running the cgi tests in env/t.
When we copy the libtool-generated shell script from env/testcgi
to env/t/cgi-bin/testcgi, on OS X the copied script isn't smart
enough to locate the actual executable (still) in env/.libs.
Copying env/.libs to env/t is enough to fix this, so that's
what we do here.
Bug reported by Boris Zentner and Christian Hansen.
Modified:
httpd/apreq/trunk/env/Makefile.am
Modified: httpd/apreq/trunk/env/Makefile.am
Url: http://svn.apache.org/viewcvs/httpd/apreq/trunk/env/Makefile.am?view=diff&rev=109980&p1=httpd/apreq/trunk/env/Makefile.am&r1=109979&p2=httpd/apreq/trunk/env/Makefile.am&r2=109980
==============================================================================
--- httpd/apreq/trunk/env/Makefile.am (original)
+++ httpd/apreq/trunk/env/Makefile.am Mon Dec 6 07:21:47 2004
@@ -45,6 +45,7 @@
run_tests : t/TEST
-cp -f test_cgi t/cgi-bin
+ -cp -Rp .libs t
MAKE=$(MAKE) @PERL@ t/TEST
else
@@ -57,7 +58,7 @@
test_clean : cmodules_clean
-MAKE=$(MAKE) @PERL@ t/TEST -clean
- -rm -rf t/htdocs t/logs t/modules t/TEST t/core t/core.* t/cgi-bin/test_cgi t/cgi-bin/.libs t/conf/extra.conf t/conf/ssl/ca t/conf/ssl/httpd-passphrase.pl
+ -rm -rf t/htdocs t/logs t/modules t/TEST t/core t/core.* t/cgi-bin/test_cgi t/cgi-bin/.libs t/.libs t/conf/extra.conf t/conf/ssl/ca t/conf/ssl/httpd-passphrase.pl
cmodules_clean:
-cd c-modules && $(MAKE) clean