Reorg Resources folder: move inkscape's shared resources into Resources/share/inkscape

(bzr r13506.1.26)

3 files changed, 26 insertions, 25 deletions

diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape
index a7baac64b..8dd41a03b 100755
--- a/packaging/macosx/Resources/bin/inkscape
+++ b/packaging/macosx/Resources/bin/inkscape
@@ -57,6 +57,7 @@ export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache"
 export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache"
 export GTK_DATA_PREFIX="$TOP"
 export GTK_EXE_PREFIX="$TOP"
+export GTK_PATH="$TOP"
 export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
 export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
 export XDG_DATA_DIRS="$TOP/share"
@@ -72,10 +73,9 @@ export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/sh
 export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
 export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
 
-export INKSCAPE_SHAREDIR="$TOP"
-# TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle
+export INKSCAPE_SHAREDIR="$TOP/share/inkscape"
 export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
-export INKSCAPE_LOCALEDIR="$TOP/locale"
+export INKSCAPE_LOCALEDIR="$TOP/share/locale"
 
 # Handle the case where the directory storing Inkscape has special characters
 # ('#', '&', '|') in the name.  These need to be escaped to work properly for 
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index d39bee144..ff0c68687 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -214,12 +214,14 @@ pkgexec="$package/Contents/MacOS"
 pkgbin="$package/Contents/Resources/bin"
 pkgshare="$package/Contents/Resources/share"
 pkglib="$package/Contents/Resources/lib"
-pkglocale="$package/Contents/Resources/locale"
+pkgetc="$package/Contents/Resources/etc"
+pkglocale="$package/Contents/Resources/share/locale"
 pkgpython="$package/Contents/Resources/python/site-packages/"
 pkgresources="$package/Contents/Resources"
 
 mkdir -p "$pkgexec"
 mkdir -p "$pkgbin"
+mkdir -p "$pkgetc"
 mkdir -p "$pkglib"
 mkdir -p "$pkgshare"
 mkdir -p "$pkglocale"
@@ -251,13 +253,13 @@ cp -v "$binary" "$binpath"
 # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not
 
 # Share files
-rsync -av "$binary_dir/../share/$binary_name"/* "$pkgresources/"
+rsync -av "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name"
 cp "$plist" "$package/Contents/Info.plist"
-rsync -av "$binary_dir/../share/locale"/* "$pkgresources/locale"
+rsync -av "$binary_dir/../share/locale"/* "$pkglocale"
 
 # Copy GTK shared mime information
 mkdir -p "$pkgresources/share"
-cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/"
+cp -rp "$LIBPREFIX/share/mime" "$pkgshare/"
 
 # Copy GTK hicolor icon theme index file
 mkdir -p "$pkgresources/share/icons/hicolor"
@@ -293,7 +295,6 @@ fi
 echo "APPLInks" > $package/Contents/PkgInfo
 
 # Pull in extra requirements for Pango and GTK
-pkgetc="$package/Contents/Resources/etc"
 mkdir -p $pkgetc/pango
 
 # Need to adjust path and quote in case of spaces in path.
diff --git a/src/path-prefix.h b/src/path-prefix.h
index be57ae354..4c31b629c 100644
--- a/src/path-prefix.h
+++ b/src/path-prefix.h
@@ -66,23 +66,23 @@ extern "C" {
 #    define CREATE_PALETTESDIR    WIN32_DATADIR("create\\swatches")
 #    define CREATE_PATTERNSDIR    WIN32_DATADIR("create\\patterns\\vector")
 #  elif defined ENABLE_OSX_APP_LOCATIONS
-#    define INKSCAPE_APPICONDIR   "Contents/Resources/pixmaps"
-#    define INKSCAPE_ATTRRELDIR   "Contents/Resources/attributes"
-#    define INKSCAPE_BINDDIR      "Contents/Resources/bind"
-#    define INKSCAPE_EXAMPLESDIR  "Contents/Resources/examples"
-#    define INKSCAPE_EXTENSIONDIR "Contents/Resources/extensions"
-#    define INKSCAPE_FILTERDIR    "Contents/Resources/filters"
-#    define INKSCAPE_GRADIENTSDIR "Contents/Resources/gradients"
-#    define INKSCAPE_KEYSDIR      "Contents/Resources/keys"
-#    define INKSCAPE_PIXMAPDIR    "Contents/Resources/icons"
-#    define INKSCAPE_MARKERSDIR   "Contents/Resources/markers"
-#    define INKSCAPE_PALETTESDIR  "Contents/Resources/palettes"
-#    define INKSCAPE_PATTERNSDIR  "Contents/Resources/patterns"
-#    define INKSCAPE_SCREENSDIR   "Contents/Resources/screens"
-#    define INKSCAPE_SYMBOLSDIR   "Contents/Resources/symbols"
-#    define INKSCAPE_TUTORIALSDIR "Contents/Resources/tutorials"
-#    define INKSCAPE_TEMPLATESDIR "Contents/Resources/templates"
-#    define INKSCAPE_UIDIR        "Contents/Resources/ui"
+#    define INKSCAPE_APPICONDIR   "Contents/Resources/share/pixmaps"
+#    define INKSCAPE_ATTRRELDIR   "Contents/Resources/share/inkscape/attributes"
+#    define INKSCAPE_BINDDIR      "Contents/Resources/share/inkscape/bind"
+#    define INKSCAPE_EXAMPLESDIR  "Contents/Resources/share/inkscape/examples"
+#    define INKSCAPE_EXTENSIONDIR "Contents/Resources/share/inkscape/extensions"
+#    define INKSCAPE_FILTERDIR    "Contents/Resources/share/inkscape/filters"
+#    define INKSCAPE_GRADIENTSDIR "Contents/Resources/share/inkscape/gradients"
+#    define INKSCAPE_KEYSDIR      "Contents/Resources/share/inkscape/keys"
+#    define INKSCAPE_PIXMAPDIR    "Contents/Resources/share/inkscape/icons"
+#    define INKSCAPE_MARKERSDIR   "Contents/Resources/share/inkscape/markers"
+#    define INKSCAPE_PALETTESDIR  "Contents/Resources/share/inkscape/palettes"
+#    define INKSCAPE_PATTERNSDIR  "Contents/Resources/share/inkscape/patterns"
+#    define INKSCAPE_SCREENSDIR   "Contents/Resources/share/inkscape/screens"
+#    define INKSCAPE_SYMBOLSDIR   "Contents/Resources/share/inkscape/symbols"
+#    define INKSCAPE_TUTORIALSDIR "Contents/Resources/share/inkscape/tutorials"
+#    define INKSCAPE_TEMPLATESDIR "Contents/Resources/share/inkscape/templates"
+#    define INKSCAPE_UIDIR        "Contents/Resources/share/inkscape/ui"
 //CREATE V0.1 support
 #    define CREATE_GRADIENTSDIR  "/Library/Application Support/create/gradients/gimp"
 #    define CREATE_PALETTESDIR   "/Library/Application Support/create/swatches"