Change INKSCAPE_JAVADIR to INKSCAPE_BINDDIR so that we can have subdirs for each...

diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index b142efd5425e4429d899eed8f0f201070a3b8e6c..4314f88196a0d0c287416a95d0a0336c8fa01369 100644 (file)
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
@@ -413,7 +413,8 @@ static void getJavaRoot(String &javaroot)
         *slashPos = '\0';
     javaroot = exeName;
     javaroot.append("\\");
-    javaroot.append(INKSCAPE_JAVADIR);
+    javaroot.append(INKSCAPE_BINDDIR);
+    javaroot.append("\\java");
 }
 
 
@@ -552,7 +553,8 @@ static CreateVMFunc getCreateVMFunc()
 
 static void getJavaRoot(String &javaroot)
 {
-    javaroot = INKSCAPE_JAVADIR;
+    javaroot = INKSCAPE_BINDDIR;
+    javaroot.append("/java");
 }
 
 #endif /* !__WIN32__ */

diff --git a/src/path-prefix.h b/src/path-prefix.h
index 451718c3c87c7c14a0d12e025fd039918724294a..a6ad95188ff754468e3743035a27813a7a3e8cf3 100644 (file)
--- a/src/path-prefix.h
+++ b/src/path-prefix.h
@@ -22,10 +22,10 @@ extern "C" {
 
 #ifdef ENABLE_BINRELOC
 #  define INKSCAPE_APPICONDIR     BR_DATADIR( "/pixmaps" )
+#  define INKSCAPE_BINDDIR        BR_DATADIR( "/inkscape/bind" )
 #  define INKSCAPE_EXAMPLESDIR    BR_DATADIR( "/inkscape/examples" )
 #  define INKSCAPE_EXTENSIONDIR   BR_DATADIR( "/inkscape/extensions" )
 #  define INKSCAPE_GRADIENTSDIR   BR_DATADIR( "/inkscape/gradients" )
-#  define INKSCAPE_JAVADIR        BR_DATADIR( "/inkscape/java" )
 #  define INKSCAPE_KEYSDIR        BR_DATADIR( "/inkscape/keys" )
 #  define INKSCAPE_PIXMAPDIR      BR_DATADIR( "/inkscape/icons" )
 #  define INKSCAPE_MARKERSDIR     BR_DATADIR( "/inkscape/markers" )
@@ -43,10 +43,10 @@ extern "C" {
 #else
 #  ifdef WIN32
 #    define INKSCAPE_APPICONDIR   "pixmaps"
+#    define INKSCAPE_BINDDIR      "share\\bind"
 #    define INKSCAPE_EXAMPLESDIR  "share\\examples"
 #    define INKSCAPE_EXTENSIONDIR "share\\extensions"
 #    define INKSCAPE_GRADIENTSDIR "share\\gradients"
-#    define INKSCAPE_JAVADIR      "share\\java"
 #    define INKSCAPE_KEYSDIR      "share\\keys"
 #    define INKSCAPE_PIXMAPDIR    "share\\icons"
 #    define INKSCAPE_MARKERSDIR   "share\\markers"
@@ -63,10 +63,10 @@ extern "C" {
 #    define CREATE_PATTERNSDIR  INKSCAPE_DATADIR "create\\patterns\\vector"
 #  elif defined ENABLE_OSX_APP_LOCATIONS
 #    define INKSCAPE_APPICONDIR   "Contents/Resources/pixmaps"
+#    define INKSCAPE_BINDDIR      "Contents/Resources/bind"
 #    define INKSCAPE_EXAMPLESDIR  "Contents/Resources/examples"
 #    define INKSCAPE_EXTENSIONDIR "Contents/Resources/extensions"
 #    define INKSCAPE_GRADIENTSDIR "Contents/Resources/gradients"
-#    define INKSCAPE_JAVADIR      "Contents/Resources/java"
 #    define INKSCAPE_KEYSDIR      "Contents/Resources/keys"
 #    define INKSCAPE_PIXMAPDIR    "Contents/Resources/icons"
 #    define INKSCAPE_MARKERSDIR   "Contents/Resources/markers"
@@ -83,10 +83,10 @@ extern "C" {
 #    define CREATE_PATTERNSDIR   "/Library/Application Support/create/patterns/vector"
 #  else
 #    define INKSCAPE_APPICONDIR   INKSCAPE_DATADIR "/pixmaps"
+#    define INKSCAPE_BINDDIR      INKSCAPE_DATADIR "/inkscape/bind"
 #    define INKSCAPE_EXAMPLESDIR  INKSCAPE_DATADIR "/inkscape/examples"
 #    define INKSCAPE_EXTENSIONDIR INKSCAPE_DATADIR "/inkscape/extensions"
 #    define INKSCAPE_GRADIENTSDIR INKSCAPE_DATADIR "/inkscape/gradients"
-#    define INKSCAPE_JAVADIR      INKSCAPE_DATADIR "/inkscape/java"
 #    define INKSCAPE_KEYSDIR      INKSCAPE_DATADIR "/inkscape/keys"
 #    define INKSCAPE_PIXMAPDIR    INKSCAPE_DATADIR "/inkscape/icons"
 #    define INKSCAPE_MARKERSDIR   INKSCAPE_DATADIR "/inkscape/markers"