Changeset 2117

Timestamp:

03/04/2008 10:12:13 PM (6 months ago)

Author:

stbuehler

Message:

fixed building/testing outside of the src dir

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• tests/symlink.t (modified) (1 diff)

trunk/NEWS

@@ -21 +21 @@
   * fix min-procs handling in mod_scgi.c, just set to max-procs (patch from #623)
   * mod_cgi: add a event-handler for STDERR_FILENO and log it with ERROR()
+  * fixed building/testing outside of the src dir
 
 - 1.5.0-r19.. -

trunk/src/Makefile.am

@@ -19 +19 @@
 mod_ssi_exprparser.c mod_ssi_exprparser.h: 
 else
-configparser.y: lemon
-mod_ssi_exprparser.y: lemon
-http_resp_parser.y: lemon
-http_req_parser.y: lemon
-http_req_range_parser.y: lemon
-
-configparser.c configparser.h: configparser.y
+$(srcdir)/configparser.y: lemon
+$(srcdir)/mod_ssi_exprparser.y: lemon
+$(srcdir)/http_resp_parser.y: lemon
+$(srcdir)/http_req_parser.y: lemon
+$(srcdir)/http_req_range_parser.y: lemon
+
+configparser.c configparser.h: $(srcdir)/configparser.y
         rm -f configparser.h
         $(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c
 
-http_resp_parser.c http_resp_parser.h: http_resp_parser.y
+http_resp_parser.c http_resp_parser.h: $(srcdir)/http_resp_parser.y
         rm -f http_resp_parser.h
         $(LEMON) -q $(srcdir)/http_resp_parser.y $(srcdir)/lempar.c
 
-http_req_parser.c http_req_parser.h: http_req_parser.y
+http_req_parser.c http_req_parser.h: $(srcdir)/http_req_parser.y
         rm -f http_req_parser.h
         $(LEMON) -q $(srcdir)/http_req_parser.y $(srcdir)/lempar.c
 
-http_req_range_parser.c http_req_range_parser.h: http_req_range_parser.y
+http_req_range_parser.c http_req_range_parser.h: $(srcdir)/http_req_range_parser.y
         rm -f http_req_range_parser.h
         $(LEMON) -q $(srcdir)/http_req_range_parser.y $(srcdir)/lempar.c
 
-mod_ssi_exprparser.c mod_ssi_exprparser.h: mod_ssi_exprparser.y 
+mod_ssi_exprparser.c mod_ssi_exprparser.h: $(srcdir)/mod_ssi_exprparser.y 
         rm -f mod_ssi_exprparser.h
         $(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c
 endif
 
-configfile.c: configparser.h
-mod_ssi_expr.c: mod_ssi_exprparser.h
-http_resp.c: http_resp_parser.h
-http_req.c: http_req_parser.h
-http_req_range.c: http_req_range_parser.h
+$(srcdir)/configfile.c: configparser.h
+$(srcdir)/mod_ssi_expr.c: mod_ssi_exprparser.h
+$(srcdir)/http_resp.c: http_resp_parser.h
+$(srcdir)/http_req.c: http_req_parser.h
+$(srcdir)/http_req_range.c: http_req_range_parser.h
 
 common_src=buffer.c log.c \

trunk/tests/symlink.t

@@ -14 +14 @@
 my $tf = LightyTest->new();
 my $t;
-my $docroot = "$tf->{'SRCDIR'}/tmp/lighttpd/servers/www.example.org/pages/";
+my $docroot = "$tf->{'TESTDIR'}/tmp/lighttpd/servers/www.example.org/pages/";
 
 sub init_testbed {