[Boost-commit] svn:boost r43759 - sandbox/SOC/2007/cgi/branches/acceptor_work/libs/cgi/example/acgi/echo

From: lists.drrngrvy_at_[hidden]
Date: 2008-03-21 14:14:29

Author: drrngrvy
Date: 2008-03-21 14:14:29 EDT (Fri, 21 Mar 2008)
New Revision: 43759
URL: http://svn.boost.org/trac/boost/changeset/43759

Log:
Resolved conflict
Text files modified: 
   sandbox/SOC/2007/cgi/branches/acceptor_work/libs/cgi/example/acgi/echo/Jamfile.v2 |    18 +++++-------------                      
   1 files changed, 5 insertions(+), 13 deletions(-)

Modified: sandbox/SOC/2007/cgi/branches/acceptor_work/libs/cgi/example/acgi/echo/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/cgi/branches/acceptor_work/libs/cgi/example/acgi/echo/Jamfile.v2	(original)
+++ sandbox/SOC/2007/cgi/branches/acceptor_work/libs/cgi/example/acgi/echo/Jamfile.v2	2008-03-21 14:14:29 EDT (Fri, 21 Mar 2008)
@@ -4,25 +4,17 @@
 #     (See accompanying file LICENSE_1_0.txt or copy 
 #        at http://www.boost.org/LICENSE_1_0.txt)
 
-exe acgi_echo
-  : main.cpp
-    /boost/thread/
+exe acgi_form_test
+  : main.cpp 
     /boost/regex/
+    /boost/thread/
   ;
 
-local LOCATION = $(cgi-bin) ;
-if ! $(LOCATION)
-{
-  LOCATION = . ;
-}
-
-
 # Our install rule (builds binaries and copies them to <location>)
 install install
- : acgi_echo
- :
+ : acgi_form_test
  :
- <location>$(LOCATION)
+ <location>$(cgi-bin)
  ;
 
 # Only install example if you use `bjam install' or equivalent