[Mobies-commit] [commit] r4053 - in UDM/trunk: . debian

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Jun 28 14:00:25 2012
New Revision: 4053

Log:
Update for Ubuntu 12.04 (Precise)

Modified:
   UDM/trunk/configure.ac
   UDM/trunk/debian/rules

Modified: UDM/trunk/configure.ac
==============================================================================
--- UDM/trunk/configure.ac	Thu Jun 28 13:59:03 2012	(r4052)
+++ UDM/trunk/configure.ac	Thu Jun 28 14:00:25 2012	(r4053)
@@ -79,7 +79,7 @@
 # Checks for libraries.
 CPPUNITLIBS="-lcppunit -ldl"
 DLOPENLIBS=""
-MINIZIPLIBS="-lz -lminizip"
+MINIZIPLIBS="-lminizip -lz"
 XERCESLIBS="-lxerces-c"
 
 # Checks for header files.

Modified: UDM/trunk/debian/rules
==============================================================================
--- UDM/trunk/debian/rules	Thu Jun 28 13:59:03 2012	(r4052)
+++ UDM/trunk/debian/rules	Thu Jun 28 14:00:25 2012	(r4053)
@@ -9,8 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-JAVA_HOME := /usr/lib/jvm/java-6-sun
-export JAVA_HOME=/usr/lib/jvm/java-6-sun
+JAVA_HOME := /usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 
 
@@ -49,7 +49,7 @@
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 	CWD=$(shell pwd)
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,-L$(shell pwd)/debian/zlib-1.2.3.3.dfsg/contrib/minizip/" CPPFLAGS="-I/usr/lib/jvm/java-6-sun/include/ -I/usr/lib/jvm/java-6-sun/include/linux/ -I$(shell pwd)/debian/zlib-1.2.3.3.dfsg/contrib/"  CXXFLAGS="-I/usr/lib/jvm/java-6-sun/include/ -I/usr/lib/jvm/java-6-sun/include/linux/ -I$(shell pwd)/debian/zlib-1.2.3.3.dfsg/contrib/"
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs,-L$(shell pwd)/debian/zlib-1.2.3.3.dfsg/contrib/minizip/" CPPFLAGS="-I/usr/lib/jvm/default-java/include/ -I/usr/lib/jvm/default-java/include/linux/ -I$(shell pwd)/debian/zlib-1.2.3.3.dfsg/contrib/"  CXXFLAGS="-I/usr/lib/jvm/default-java/include/ -I/usr/lib/jvm/default-java/include/linux/ -I$(shell pwd)/debian/zlib-1.2.3.3.dfsg/contrib/"
 
 build: build-stamp
 build-stamp:  config.status