[beast: 5/9] BUILD: rename installpath datadir

[Tim Janik <timj src gnome org>]

commit c2d43ecaf9b66111f45abbb72ccd4bd190006239
Author: Tim Janik <timj gnu org>
Date:   Wed Oct 28 09:32:16 2015 +0100

    BUILD: rename installpath datadir
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstdefs.hh             |    2 +-
 beast-gtk/bstkeybindings.cc      |    2 +-
 beast-gtk/bstmain.cc             |   12 ++++++------
 beast-gtk/bstpreferences.cc      |    2 +-
 beast-gtk/testgui.cc             |    2 +-
 beast-gtk/tsmview.cc             |    2 +-
 bse/bsescripthelper.cc           |    2 +-
 bse/bseserver.cc                 |   10 +++++-----
 bse/bsewave.cc                   |    2 +-
 configure.ac                     |    6 +++---
 data/Makefile.am                 |    2 +-
 data/bse.pc.in                   |   10 +++++-----
 docs/images/Makefile.am          |    2 +-
 library/demo/Makefile.am         |    2 +-
 library/effects/Makefile.am      |    2 +-
 library/instruments/Makefile.am  |    2 +-
 library/keys/Makefile.am         |    2 +-
 library/samples/Makefile.am      |    2 +-
 library/scripts/Makefile.am      |    2 +-
 library/skins/Makefile.am        |    2 +-
 library/skins/images/Makefile.am |    2 +-
 sfi/glib-extra.cc                |   18 +++++++++---------
 sfi/glib-extra.hh                |   18 +++++++++---------
 shell/Makefile.am                |    2 +-
 shell/bsescm.cc                  |    2 +-
 25 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/beast-gtk/bstdefs.hh b/beast-gtk/bstdefs.hh
index 5831600..a0342f8 100644
--- a/beast-gtk/bstdefs.hh
+++ b/beast-gtk/bstdefs.hh
@@ -50,7 +50,7 @@ typedef enum /*< skip >*/
 #define        BST_TAG_DIAMETER          (20)
 #define BST_STRDUP_RC_FILE()     (g_strconcat (g_get_home_dir (), "/.beast/beastrc", NULL))
 #define BST_STRDUP_SKIN_PATH()   (g_strconcat ("~/.beast/skins/:~/.beast/skins/*/:", \
-                                                bse_installpath (BSE_INSTALLPATH_PKGDATADIR_SKINS).c_str(), 
NULL))
+                                                bse_installpath (BSE_INSTALLPATH_DATADIR_SKINS).c_str(), 
NULL))
 
 /* --- configuration candidates --- */
 /* mouse button numbers and masks for drag operations */
diff --git a/beast-gtk/bstkeybindings.cc b/beast-gtk/bstkeybindings.cc
index 5f121ba..2c80b03 100644
--- a/beast-gtk/bstkeybindings.cc
+++ b/beast-gtk/bstkeybindings.cc
@@ -216,7 +216,7 @@ key_bindings_exec_action (gpointer data,
         static GtkWidget *load_dialog = NULL;
         if (!load_dialog)
           load_dialog = bst_file_dialog_create();
-        bst_file_dialog_setup (load_dialog, self, _("Load Key Binding"), bse_installpath 
(BSE_INSTALLPATH_PKGDATADIR_KEYS).c_str());
+        bst_file_dialog_setup (load_dialog, self, _("Load Key Binding"), bse_installpath 
(BSE_INSTALLPATH_DATADIR_KEYS).c_str());
         gxk_widget_showraise (load_dialog);
         bst_file_dialog_set_handler (BST_FILE_DIALOG (load_dialog), key_bindings_load_file, self, NULL);
       }
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index b1a320e..51f87a1 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -115,7 +115,7 @@ main (int   argc,
   gxk_init ();
   /* documentation search paths */
   gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
-  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
+  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DATADIR_IMAGES).c_str());
   gxk_text_add_tsm_path (".");
   /* now, we can popup the splash screen */
   beast_splash = bst_splash_new ("BEAST-Splash", BST_SPLASH_WIDTH, BST_SPLASH_HEIGHT, 15);
@@ -143,7 +143,7 @@ main (int   argc,
 
   /* show splash images */
   bst_splash_update_item (beast_splash, _("Splash Image"));
-  string = g_strconcat (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str(), G_DIR_SEPARATOR_S, 
BST_SPLASH_IMAGE, NULL);
+  string = g_strconcat (bse_installpath (BSE_INSTALLPATH_DATADIR_IMAGES).c_str(), G_DIR_SEPARATOR_S, 
BST_SPLASH_IMAGE, NULL);
   anim = gdk_pixbuf_animation_new_from_file (string, NULL);
   g_free (string);
   bst_splash_update ();
@@ -630,13 +630,13 @@ bst_args_process (int *argc_p, char **argv)
           if (strcmp (arg, "docs") == 0)
            printout ("%s\n", bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
          else if (strcmp (arg, "images") == 0)
-           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
+           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_DATADIR_IMAGES).c_str());
          else if (strcmp (arg, "locale") == 0)
            printout ("%s\n", bse_installpath (BSE_INSTALLPATH_LOCALEBASE).c_str());
          else if (strcmp (arg, "skins") == 0)
            printout ("%s\n", freeme = BST_STRDUP_SKIN_PATH ());
          else if (strcmp (arg, "keys") == 0)
-           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_KEYS).c_str());
+           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_DATADIR_KEYS).c_str());
          else if (strcmp (arg, "ladspa") == 0)
            printout ("%s\n", bse_installpath (BSE_INSTALLPATH_LADSPA).c_str());
          else if (strcmp (arg, "plugins") == 0)
@@ -714,9 +714,9 @@ bst_exit_print_version (void)
   printout ("\n");
   printout ("Binaries:        %s\n", bse_installpath (BSE_INSTALLPATH_BINDIR).c_str());
   printout ("Doc Path:        %s\n", bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
-  printout ("Image Path:      %s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
+  printout ("Image Path:      %s\n", bse_installpath (BSE_INSTALLPATH_DATADIR_IMAGES).c_str());
   printout ("Locale Path:     %s\n", bse_installpath (BSE_INSTALLPATH_LOCALEBASE).c_str());
-  printout ("Keyrc Path:      %s\n", bse_installpath (BSE_INSTALLPATH_PKGDATADIR_KEYS).c_str());
+  printout ("Keyrc Path:      %s\n", bse_installpath (BSE_INSTALLPATH_DATADIR_KEYS).c_str());
   printout ("Skin Path:       %s\n", freeme = BST_STRDUP_SKIN_PATH());
   printout ("Sample Path:     %s\n", bse_server.get_sample_path());
   printout ("Script Path:     %s\n", bse_server.get_script_path());
diff --git a/beast-gtk/bstpreferences.cc b/beast-gtk/bstpreferences.cc
index 7cc7b06..2e65d80 100644
--- a/beast-gtk/bstpreferences.cc
+++ b/beast-gtk/bstpreferences.cc
@@ -291,7 +291,7 @@ bst_preferences_load_rc_files (void)
   if (error == Bse::ERROR_FILE_NOT_FOUND)
     {
       /* try loading fallback table */
-      gchar *file = g_strconcat (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_KEYS).c_str(), 
G_DIR_SEPARATOR_S, "keyrc.us", NULL);
+      gchar *file = g_strconcat (bse_installpath (BSE_INSTALLPATH_DATADIR_KEYS).c_str(), G_DIR_SEPARATOR_S, 
"keyrc.us", NULL);
       error = bst_key_binding_parse (file, slist);
       g_free (file);
     }
diff --git a/beast-gtk/testgui.cc b/beast-gtk/testgui.cc
index 4804800..3511a6b 100644
--- a/beast-gtk/testgui.cc
+++ b/beast-gtk/testgui.cc
@@ -91,7 +91,7 @@ main (int   argc,
   gxk_init ();
   /* add documentation search paths */
   gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
-  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
+  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DATADIR_IMAGES).c_str());
   gxk_text_add_tsm_path (".");
   /* initialize BEAST GUI components */
   _bst_init_utils ();
diff --git a/beast-gtk/tsmview.cc b/beast-gtk/tsmview.cc
index ab39b47..253e328 100644
--- a/beast-gtk/tsmview.cc
+++ b/beast-gtk/tsmview.cc
@@ -51,7 +51,7 @@ main (int   argc,
     title = g_strdup (".");
   gxk_text_add_tsm_path (".");
   gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DOCDIR).c_str());
-  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_IMAGES).c_str());
+  gxk_text_add_tsm_path (bse_installpath (BSE_INSTALLPATH_DATADIR_IMAGES).c_str());
   sctext = gxk_scroll_text_create (GXK_SCROLL_TEXT_NAVIGATABLE | flags, NULL);
   gxk_scroll_text_enter (sctext, title);
   for (i = 1; i < uint (argc); i++)
diff --git a/bse/bsescripthelper.cc b/bse/bsescripthelper.cc
index 03242ae..ee34c68 100644
--- a/bse/bsescripthelper.cc
+++ b/bse/bsescripthelper.cc
@@ -231,7 +231,7 @@ bse_script_path_list_files (void)
     }
   if (1)
     {
-      files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_SCRIPTS).c_str(), 
"*.scm", G_FILE_TEST_IS_REGULAR);
+      files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_DATADIR_SCRIPTS).c_str(), 
"*.scm", G_FILE_TEST_IS_REGULAR);
       ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
     }
   if (BSE_GCONFIG (script_path) && BSE_GCONFIG (script_path)[0])
diff --git a/bse/bseserver.cc b/bse/bseserver.cc
index 486e437..744e0c8 100644
--- a/bse/bseserver.cc
+++ b/bse/bseserver.cc
@@ -1169,31 +1169,31 @@ ServerImpl::get_plugin_path ()
 String
 ServerImpl::get_script_path ()
 {
-  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_SCRIPTS), BSE_GCONFIG 
(script_path));
+  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_DATADIR_SCRIPTS), BSE_GCONFIG 
(script_path));
 }
 
 String
 ServerImpl::get_instrument_path ()
 {
-  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_INSTRUMENTS), BSE_GCONFIG 
(instrument_path));
+  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_DATADIR_INSTRUMENTS), BSE_GCONFIG 
(instrument_path));
 }
 
 String
 ServerImpl::get_sample_path ()
 {
-  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_SAMPLES), BSE_GCONFIG 
(sample_path));
+  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_DATADIR_SAMPLES), BSE_GCONFIG 
(sample_path));
 }
 
 String
 ServerImpl::get_effect_path ()
 {
-  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_EFFECTS), BSE_GCONFIG 
(effect_path));
+  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_DATADIR_EFFECTS), BSE_GCONFIG 
(effect_path));
 }
 
 String
 ServerImpl::get_demo_path ()
 {
-  return bse_installpath (BSE_INSTALLPATH_PKGDATADIR_DEMO);
+  return bse_installpath (BSE_INSTALLPATH_DATADIR_DEMO);
 }
 
 String
diff --git a/bse/bsewave.cc b/bse/bsewave.cc
index 1919f1b..995e482 100644
--- a/bse/bsewave.cc
+++ b/bse/bsewave.cc
@@ -267,7 +267,7 @@ bse_wave_load_wave_file (BseWave      *self,
       if (bse_main_args->override_sample_path)
        sample_path = bse_main_args->override_sample_path;
       else
-       sample_path = Rapicorn::Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_PKGDATADIR_SAMPLES), 
BSE_GCONFIG (sample_path));
+       sample_path = Rapicorn::Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_DATADIR_SAMPLES), 
BSE_GCONFIG (sample_path));
       files = sfi_file_crawler_list_files (sample_path.c_str(), file_name, G_FILE_TEST_IS_REGULAR);
 
       for (walk = files; walk; walk = sfi_ring_walk (files, walk))
diff --git a/configure.ac b/configure.ac
index b1a6444..f0e4d62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,11 +74,11 @@ AC_SUBST(LT_VERSION_INFO)
 
 # Define package directories per major/minor version
 bselibdir="\${libdir}/bse-$MAJOR.$MINOR.$MICRO"
-pkgdatadir="\${datarootdir}/beast"
+datadir="\${datarootdir}/beast"
 docdir="${datarootdir}/doc/beast" # "beast-$MAJOR"
 # Substitute directories in Makefiles
 AC_SUBST(bselibdir)
-AC_SUBST(pkgdatadir)
+AC_SUBST(datadir)
 AC_SUBST(docdir)
 # Provide directories for C++
 bak_prefix="$prefix" ; bak_exec_prefix="$exec_prefix" ; bak_libdir="$libdir" ; 
bak_datarootdir="$datarootdir" ; bak_datadir="$datadir"
@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED(INSTALLPATH_BINDIR, ["`eval echo "${bindir}"`"], [Directory t
 AC_DEFINE_UNQUOTED(INSTALLPATH_LOCALEBASE, ["`eval echo ${localedir}`"], [Base directory for locale specific 
message catalogs])
 AC_DEFINE_UNQUOTED(INSTALLPATH_LADSPA, ["`eval echo ${libdir}/ladspa`"], [Searchpath for LADSPA plugins])
 AC_DEFINE_UNQUOTED(INSTALLPATH_BSELIBDIR, ["`eval echo ${bselibdir}`"], [Directory to install plugins and 
drivers])
-AC_DEFINE_UNQUOTED(INSTALLPATH_PKGDATADIR, ["`eval echo ${pkgdatadir}`"], [Directory to install samples, 
effects, scripts, etc])
+AC_DEFINE_UNQUOTED(INSTALLPATH_DATADIR, ["`eval echo ${datadir}`"], [Directory to install samples, effects, 
scripts, etc])
 AC_DEFINE_UNQUOTED(INSTALLPATH_DOCDIR, ["`eval echo ${docdir}`"], [Directory to install documentation])
 AC_DEFINE_UNQUOTED(INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
 prefix="$bak_prefix" ; exec_prefix="$bak_exec_prefix" ; libdir="$bak_libdir" ; 
datarootdir="$bak_datarootdir" ; datadir="$bak_datadir"
diff --git a/data/Makefile.am b/data/Makefile.am
index 633372c..d52e963 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ public_images = $(strip         \
        beast-splash.png        \
 )
 images_DATA = ${public_images}
-imagesdir = $(pkgdatadir)/images
+imagesdir = $(datadir)/images
 EXTRA_DIST += $(private_images) $(public_images)
 
 # generate image header files
diff --git a/data/bse.pc.in b/data/bse.pc.in
index df7d4e5..5d1f005 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -7,13 +7,13 @@ includedir= includedir@
 pkgincludedir= includedir@/bse- MAJOR@
 
 sfidl= exec_prefix@/sfidl
-demodir= pkgdatadir@/demo
-sampledir= pkgdatadir@/samples
-scriptdir= pkgdatadir@/scripts
+demodir= datadir@/demo
+sampledir= datadir@/samples
+scriptdir= datadir@/scripts
 plugindir= bselibdir@/plugins
 driverdir= bselibdir@/drivers
-effectdir= pkgdatadir@/effects
-instrumentdir= pkgdatadir@/instruments
+effectdir= datadir@/effects
+instrumentdir= datadir@/instruments
 
 Name: Beast & Bse
 Description: Beast & Bse are an audio tracker and audio synthesis engine.
diff --git a/docs/images/Makefile.am b/docs/images/Makefile.am
index 48733f9..ce8289d 100644
--- a/docs/images/Makefile.am
+++ b/docs/images/Makefile.am
@@ -7,5 +7,5 @@ SVG_FILES = beast-components.svg  beast-progs.svg  module-voices.svg
 
 # PNG_FILES = beast-components.png  beast-progs.png  module-voices.png
 # docimages_DATA = $(PNG_FILES)
-# docimagesdir = $(pkgdatadir)/images
+# docimagesdir = $(datadir)/images
 # EXTRA_DIST += $(PNG_FILES)
diff --git a/library/demo/Makefile.am b/library/demo/Makefile.am
index 5a144c2..4111c68 100644
--- a/library/demo/Makefile.am
+++ b/library/demo/Makefile.am
@@ -7,6 +7,6 @@ demo_DATA = $(strip             \
        stereo-through.bse      \
        x2-midi-test.bse        \
 )
-demodir = $(pkgdatadir)/demo
+demodir = $(datadir)/demo
 
 EXTRA_DIST += $(demo_DATA)
diff --git a/library/effects/Makefile.am b/library/effects/Makefile.am
index abc3d26..287c28e 100644
--- a/library/effects/Makefile.am
+++ b/library/effects/Makefile.am
@@ -8,6 +8,6 @@ effects_DATA = $(strip                  \
        bqs-reverb.bse                  \
        bqs-saturation-and-reverb.bse   \
 )
-effectsdir = $(pkgdatadir)/effects
+effectsdir = $(datadir)/effects
 
 EXTRA_DIST += $(effects_DATA)
diff --git a/library/instruments/Makefile.am b/library/instruments/Makefile.am
index af89ad3..8ca8c98 100644
--- a/library/instruments/Makefile.am
+++ b/library/instruments/Makefile.am
@@ -10,6 +10,6 @@ instruments_DATA = $(strip    \
        illus-vtremolo.bse              \
        stw-iron-string.bse             \
 )
-instrumentsdir = $(pkgdatadir)/instruments
+instrumentsdir = $(datadir)/instruments
 
 EXTRA_DIST += $(instruments_DATA)
diff --git a/library/keys/Makefile.am b/library/keys/Makefile.am
index 37087a6..8f721b5 100644
--- a/library/keys/Makefile.am
+++ b/library/keys/Makefile.am
@@ -5,6 +5,6 @@ keys_DATA = $(strip             \
        keyrc.de                \
        keyrc.us                \
 )
-keysdir = $(pkgdatadir)/keys
+keysdir = $(datadir)/keys
 
 EXTRA_DIST += $(keys_DATA)
diff --git a/library/samples/Makefile.am b/library/samples/Makefile.am
index 7378555..2615d94 100644
--- a/library/samples/Makefile.am
+++ b/library/samples/Makefile.am
@@ -5,6 +5,6 @@ include $(top_srcdir)/Makefile.decl
 sample_DATA = $(strip                  \
        retrokit.bsewave                \
 )
-sampledir = $(pkgdatadir)/samples
+sampledir = $(datadir)/samples
 
 EXTRA_DIST += $(sample_DATA)
diff --git a/library/scripts/Makefile.am b/library/scripts/Makefile.am
index 462eaed..2c577cf 100644
--- a/library/scripts/Makefile.am
+++ b/library/scripts/Makefile.am
@@ -10,6 +10,6 @@ scripts_DATA = $(strip                        \
        part-harmonic-transposer.scm    \
        mixer-splitup-by-track.scm      \
 )
-scriptsdir = $(pkgdatadir)/scripts
+scriptsdir = $(datadir)/scripts
 
 EXTRA_DIST += $(scripts_DATA)
diff --git a/library/skins/Makefile.am b/library/skins/Makefile.am
index 6b3bccf..fecdff9 100644
--- a/library/skins/Makefile.am
+++ b/library/skins/Makefile.am
@@ -11,6 +11,6 @@ skins_DATA = $(strip          \
        silvervein.skin         \
        white.skin              \
 )
-skinsdir = $(pkgdatadir)/skins
+skinsdir = $(datadir)/skins
 
 EXTRA_DIST += $(skins_DATA)
diff --git a/library/skins/images/Makefile.am b/library/skins/images/Makefile.am
index 9e9379c..d58b572 100644
--- a/library/skins/images/Makefile.am
+++ b/library/skins/images/Makefile.am
@@ -9,6 +9,6 @@ images_DATA = $(strip           \
        moonpaper.png           \
        silvervein.png          \
 )
-imagesdir = $(pkgdatadir)/skins/images
+imagesdir = $(datadir)/skins/images
 
 EXTRA_DIST += $(images_DATA)
diff --git a/sfi/glib-extra.cc b/sfi/glib-extra.cc
index 1f06ffc..22ebce0 100644
--- a/sfi/glib-extra.cc
+++ b/sfi/glib-extra.cc
@@ -1042,15 +1042,15 @@ bse_installpath (BseInstallpathType installpath_type)
     case BSE_INSTALLPATH_BSELIBDIR:                     return INSTALLPATH_BSELIBDIR;
     case BSE_INSTALLPATH_BSELIBDIR_PLUGINS:             return bse_installpath (BSE_INSTALLPATH_BSELIBDIR) + 
"/plugins";
     case BSE_INSTALLPATH_BSELIBDIR_DRIVERS:             return bse_installpath (BSE_INSTALLPATH_BSELIBDIR) + 
"/drivers";
-    case BSE_INSTALLPATH_PKGDATADIR:                    return INSTALLPATH_PKGDATADIR;
-    case BSE_INSTALLPATH_PKGDATADIR_DEMO:               return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/demo";
-    case BSE_INSTALLPATH_PKGDATADIR_SAMPLES:            return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/samples";
-    case BSE_INSTALLPATH_PKGDATADIR_EFFECTS:            return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/effects";
-    case BSE_INSTALLPATH_PKGDATADIR_INSTRUMENTS:        return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/instruments";
-    case BSE_INSTALLPATH_PKGDATADIR_SCRIPTS:            return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/scripts";
-    case BSE_INSTALLPATH_PKGDATADIR_IMAGES:             return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/images";
-    case BSE_INSTALLPATH_PKGDATADIR_KEYS:               return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/keys";
-    case BSE_INSTALLPATH_PKGDATADIR_SKINS:              return bse_installpath (BSE_INSTALLPATH_PKGDATADIR) 
+ "/skins";
+    case BSE_INSTALLPATH_DATADIR:                       return INSTALLPATH_DATADIR;
+    case BSE_INSTALLPATH_DATADIR_DEMO:                  return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/demo";
+    case BSE_INSTALLPATH_DATADIR_SAMPLES:               return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/samples";
+    case BSE_INSTALLPATH_DATADIR_EFFECTS:               return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/effects";
+    case BSE_INSTALLPATH_DATADIR_INSTRUMENTS:           return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/instruments";
+    case BSE_INSTALLPATH_DATADIR_SCRIPTS:               return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/scripts";
+    case BSE_INSTALLPATH_DATADIR_IMAGES:                return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/images";
+    case BSE_INSTALLPATH_DATADIR_KEYS:                  return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/keys";
+    case BSE_INSTALLPATH_DATADIR_SKINS:                 return bse_installpath (BSE_INSTALLPATH_DATADIR) + 
"/skins";
     }
   return "";
 }
diff --git a/sfi/glib-extra.hh b/sfi/glib-extra.hh
index fb84533..1c98990 100644
--- a/sfi/glib-extra.hh
+++ b/sfi/glib-extra.hh
@@ -315,15 +315,15 @@ enum BseInstallpathType {
   BSE_INSTALLPATH_BSELIBDIR,
   BSE_INSTALLPATH_BSELIBDIR_PLUGINS,
   BSE_INSTALLPATH_BSELIBDIR_DRIVERS,
-  BSE_INSTALLPATH_PKGDATADIR,
-  BSE_INSTALLPATH_PKGDATADIR_DEMO,
-  BSE_INSTALLPATH_PKGDATADIR_SAMPLES,
-  BSE_INSTALLPATH_PKGDATADIR_EFFECTS,
-  BSE_INSTALLPATH_PKGDATADIR_INSTRUMENTS,
-  BSE_INSTALLPATH_PKGDATADIR_SCRIPTS,
-  BSE_INSTALLPATH_PKGDATADIR_IMAGES,
-  BSE_INSTALLPATH_PKGDATADIR_KEYS,
-  BSE_INSTALLPATH_PKGDATADIR_SKINS,
+  BSE_INSTALLPATH_DATADIR,
+  BSE_INSTALLPATH_DATADIR_DEMO,
+  BSE_INSTALLPATH_DATADIR_SAMPLES,
+  BSE_INSTALLPATH_DATADIR_EFFECTS,
+  BSE_INSTALLPATH_DATADIR_INSTRUMENTS,
+  BSE_INSTALLPATH_DATADIR_SCRIPTS,
+  BSE_INSTALLPATH_DATADIR_IMAGES,
+  BSE_INSTALLPATH_DATADIR_KEYS,
+  BSE_INSTALLPATH_DATADIR_SKINS,
 };
 /// Provide installation directories and searchpaths for various types of data.
 std::string bse_installpath  (BseInstallpathType installpath_type);
diff --git a/shell/Makefile.am b/shell/Makefile.am
index b648771..008d5ab 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST += bsescminterp.hh
 #
 # scripts
 #
-shellscriptdir = $(pkgdatadir)/scripts
+shellscriptdir = $(datadir)/scripts
 shellscript_DATA = bse-scm-glue.boot
 
 EXTRA_DIST += $(shellscript_DATA)
diff --git a/shell/bsescm.cc b/shell/bsescm.cc
index a856c3d..572d3e5 100644
--- a/shell/bsescm.cc
+++ b/shell/bsescm.cc
@@ -26,7 +26,7 @@ static gboolean        bse_scm_auto_load = TRUE;
 static gboolean        bse_scm_auto_play = TRUE;
 static SfiComPort     *bse_scm_port = NULL;
 static SfiGlueContext *bse_scm_context = NULL;
-static std::string     boot_script_path = bse_installpath (BSE_INSTALLPATH_PKGDATADIR_SCRIPTS);
+static std::string     boot_script_path = bse_installpath (BSE_INSTALLPATH_DATADIR_SCRIPTS);
 
 /* --- functions --- */
 static void