SimDist/packages/lcio

diff -u -r1.11 -r1.12
--- Makefile.in	23 May 2008 21:32:41 -0000	1.11
+++ Makefile.in	23 May 2008 22:16:01 -0000	1.12
@@ -1,4 +1,4 @@

-# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.11 2008/05/23 21:32:41 jeremy Exp $

+# $Header: /cvs/lcd/SimDist/packages/lcio/Makefile.in,v 1.12 2008/05/23 22:16:01 jeremy Exp $

 # default
 
 targets := cvs config

@@ -16,7 +16,10 @@

 	PATH="$(LCIO)/tools:$(LCIO)/bin:$(PATH)" ; cd $(PACKAGE_BUILDDIR) ; $(ANT) aid.generate cpp;:
 
 compile_cmake:

-	cd $(PACKAGE_BUILDDIR); $(CMAKE) -DBUILD_SHARED_LIBS=OFF -DJAVA_HOME=$(JAVA_HOME) .; mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install

+	cd $(PACKAGE_BUILDDIR); \
+	rm BuildSetup.cmake; touch BuildSetup.cmake; \
+	$(CMAKE) -DBUILD_SHARED_LIBS=OFF -DJAVA_HOME=$(JAVA_HOME) -DJDK_HOME=$(JDK_HOME) -DJAVA_BIN_PATH=$(JDK_HOME)/bin .; \
+	mkdir build; cd build; $(CMAKE) -C ../BuildSetup.cmake ..; cd ..; $(MAKE) install

 
 # package build
 include ../../build/package.gmk