You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

27 lines
1.2 KiB

  1. diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac
  2. --- jamvm-2.0.0.old/configure.ac 2014-06-10 21:33:37.000000000 +0100
  3. +++ jamvm-2.0.0/configure.ac 2014-11-28 19:22:12.183091414 +0000
  4. @@ -236,6 +236,7 @@
  5. install_dir=$prefix
  6. fi
  7. AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)])
  8. +AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)])
  9. AC_ARG_ENABLE(zip,
  10. [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,)
  11. diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c
  12. --- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c 2012-05-17 22:01:47.000000000 +0100
  13. +++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c 2014-11-28 19:23:27.312108240 +0000
  14. @@ -110,10 +110,10 @@
  15. separate class files in a directory structure */
  16. #ifdef USE_ZIP
  17. -#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip"
  18. +#define JAMVM_CLASSES PKGDATADIR"/classes.zip"
  19. #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip"
  20. #else
  21. -#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes"
  22. +#define JAMVM_CLASSES PKGDATADIR"/classes"
  23. #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath"
  24. #endif