diff -u -r1.59 -r1.60
--- CMakeLists.txt	5 May 2010 13:13:23 -0000	1.59
+++ CMakeLists.txt	12 May 2010 14:15:40 -0000	1.60
@@ -131,24 +131,24 @@

     IF( SH )
         # generate shell script for setting environment
         # and calling ant aid

-        MESSAGE( STATUS "Generating shell script for calling ant..." )
-        FILE( WRITE "${PROJECT_BINARY_DIR}/script.sh"

+        MESSAGE( STATUS "Generating LCIO env init script..." )
+        FILE( WRITE "${PROJECT_BINARY_DIR}/lcio_env_init.sh"

             "export LCIO=${PROJECT_SOURCE_DIR}\n"
             "export JDK_HOME=${JAVA_HOME}\n"
             "export JAVA_HOME=${JAVA_HOME}\n"
             "export PATH=${PROJECT_SOURCE_DIR}/tools:${JAVA_BIN_PATH}:$PATH\n"

-            "ant $1" )

+            "eval $*" )

      
         # create "always out-of-date" headers target
         ADD_CUSTOM_TARGET( headers

-            COMMAND ${SH} "${PROJECT_BINARY_DIR}/script.sh" aid.generate

+            COMMAND ${SH} "${PROJECT_BINARY_DIR}/lcio_env_init.sh" ant aid.generate

             WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
             COMMENT "Generating header files with ant aid.generate..."
             VERBATIM )
         
         #ADD_CUSTOM_COMMAND(
         #    OUTPUT "${PROJECT_BINARY_DIR}/src/cpp/include/EVENT/LCIO.h"

-        #    COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/script.sh" aid.generate

+        #    COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" ant aid.generate

         #    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
         #    COMMENT "Generating header files with ant aid.generate..."
         #    VERBATIM )

@@ -159,7 +159,7 @@

         # LCIO - JAVA
         ADD_CUSTOM_COMMAND(
             OUTPUT "${PROJECT_SOURCE_DIR}/lib/lcio.jar"

-            COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/script.sh" aid

+            COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" ant aid

             WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
             COMMENT "Building LCIO Java..."
             VERBATIM )

@@ -169,7 +169,7 @@

 
         # create custom target for cleaning class files
         ADD_CUSTOM_TARGET( jar_clean

-            COMMAND ${SH} "${PROJECT_BINARY_DIR}/script.sh" clean

+            COMMAND ${SH} "${PROJECT_BINARY_DIR}/lcio_env_init.sh" ant clean

             WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
             COMMENT "Cleaning java classes with ant clean..."
             VERBATIM )

@@ -182,7 +182,7 @@

         IF( JAVA_DOC )
             ADD_CUSTOM_COMMAND(
                 OUTPUT "${PROJECT_SOURCE_DIR}/doc/api/index.html"

-                COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/script.sh" doc

+                COMMAND ${SH} ARGS "${PROJECT_BINARY_DIR}/lcio_env_init.sh" ant doc

                 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
                 COMMENT "Building Java API Documentation..."
                 VERBATIM )