From: Alan W. I. <ai...@us...> - 2004-06-29 04:59:01
|
Update of /cvsroot/plplot/plplot/bindings/java In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21425/bindings/java Modified Files: Makefile.am config.java.in Log Message: New paradigm for Java install. * plplotjavac_wrap.so installed in $prefix/lib/plplot$version/java * the rest of the files (which are not architecture specific) are assembled in the $prefix/share/plplot$version/java/plplot/* tree, then put into $prefix/share/plplot$version/java/plplot.jar with the jar command, and the now redundant the $prefix/share/plplot$version/java/plplot/* tree is subsequently removed. Index: config.java.in =================================================================== RCS file: /cvsroot/plplot/plplot/bindings/java/config.java.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- config.java.in 17 Jan 2004 16:41:37 -0000 1.4 +++ config.java.in 29 Jun 2004 04:58:51 -0000 1.5 @@ -22,5 +22,5 @@ public class config { // Must be installed absolute path name of generated DLL - public static String libname = "@JAVA_INSTDIR@/@PLPLOTJAVAC_WRAP_DLL@"; + public static String libname = "@JAVAWRAPPER_HARDDIR@/@PLPLOTJAVAC_WRAP_DLL@"; }; Index: Makefile.am =================================================================== RCS file: /cvsroot/plplot/plplot/bindings/java/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Makefile.am 14 Jun 2004 21:51:50 -0000 1.27 +++ Makefile.am 29 Jun 2004 04:58:51 -0000 1.28 @@ -56,7 +56,8 @@ $(SWIG_CMD) -package plplot.core plplotjavac.i # Must have "exec" in the name. -ourexecjavadir = $(libdir)/java/plplot/core +ourexecjavadir = $(DATA_DIR)/java/plplot/core +execjavawrapperdir = $(JAVAWRAPPER_DIR) libplplot = $(top_builddir)/src/libplplot$(LIB_TAG).la @@ -67,7 +68,7 @@ # no-undefined should work on all platforms here since libplplot should # resolve all symbols. plplotjavac_wrap_la_LDFLAGS = \ - -rpath $(ourexecjavadir) \ + -rpath $(execjavawrapperdir) \ -module \ -avoid-version \ -no-undefined \ @@ -79,7 +80,7 @@ # widespread. ourexecjava_DATA = README.javaAPI $(javafiles) -ourexecjava_LTLIBRARIES = plplotjavac_wrap.la +execjavawrapper_LTLIBRARIES = plplotjavac_wrap.la # if enable_java endif @@ -89,9 +90,9 @@ install-exec-hook: if enable_java - ( cd $(DESTDIR)$(ourexecjavadir) ; \ + ( cd $(DESTDIR)$(execjavawrapperdir) ; \ rm -f plplotjavac_wrap*.a plplotjavac_wrap*.la ; \ - cd $(DESTDIR)$(libdir) ; \ + cd $(DESTDIR)$(DATA_DIR) ; \ javac -classpath java -d java java/plplot/core/*.java) endif |