[gentoo-commits] gentoo-x86 commit in dev-java/jamvm/files: jamvm-1.5.0.env classes-location.patch

[gentoo-commits] gentoo-x86 commit in dev-java/jamvm/files: jamvm-1.5.0.env classes-location.patch

[Petteri Raty (betelgeuse)]

betelgeuse    08/03/03 17:27:54

  Added:                jamvm-1.5.0.env classes-location.patch
  Log:
  Version bump. Fixes bug #181896 and part of fixing bug #163724.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  dev-java/jamvm/files/jamvm-1.5.0.env

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/jamvm-1.5.0.env?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/jamvm-1.5.0.env?rev=1.1&content-type=text/plain

Index: jamvm-1.5.0.env
===================================================================
VERSION="JamVM @PV@"
JAVA_HOME=/opt/@PN@
BOOTCLASSPATH="/opt/jamvm/classes.zip:/opt/gnu-classpath-0.97/share/classpath/glibj.zip"
JDK_HOME=/opt/@PN@
JAVAC=${JAVA_HOME}/bin/javac
PATH="${JAVA_HOME}/bin"
ROOTPATH="${JAVA_HOME}/bin"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.5"
GENERATION="2"
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH"



1.1                  dev-java/jamvm/files/classes-location.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/classes-location.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/classes-location.patch?rev=1.1&content-type=text/plain

Index: classes-location.patch
===================================================================
diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac
--- jamvm-1.5.0.old/configure.ac	2008-03-03 17:31:46.000000000 +0200
+++ jamvm-1.5.0/configure.ac	2008-03-03 17:36:14.000000000 +0200
@@ -208,6 +208,7 @@
     install_dir=$prefix
 fi
 AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
+AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
 
 AC_ARG_ENABLE(zip,
     [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h
--- jamvm-1.5.0.old/src/class.h	2008-03-03 17:31:46.000000000 +0200
+++ jamvm-1.5.0/src/class.h	2008-03-03 17:36:51.000000000 +0200
@@ -39,10 +39,10 @@
    separate class files in a directory structure */
 
 #ifdef USE_ZIP
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
+#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
 #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
 #else
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
+#define JAMVM_CLASSES PKGDATADIR"/classes"
 #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
 #endif
 



-- 
gentoo-commits@lists.gentoo.org mailing list