GNOME.org
 

[beast: 5/12] BUILD: install bse plugins and drivers into prefix/lib/bse-<MAJOR>/

commit 3e274bc6d6052916127604f1d4f59081a4124f5e
Author: Tim Janik <timj gnu org>
Date:   Mon Oct 19 23:47:50 2015 +0200

    BUILD: install bse plugins and drivers into prefix/lib/bse-<MAJOR>/
    
    Signed-off-by: Tim Janik <timj gnu org>

 beast-gtk/bstmain.cc          |    2 +-
 bse/bseplugin.cc              |    8 ++++----
 bse/bseserver.cc              |    2 +-
 configure.ac                  |    6 +++---
 data/bse.pc.in                |    4 ++--
 drivers/Makefile.am           |    2 +-
 plugins/Makefile.am           |    4 ++--
 plugins/evaluator/Makefile.am |    2 +-
 plugins/freeverb/Makefile.am  |    2 +-
 sfi/glib-extra.cc             |    6 +++---
 sfi/glib-extra.hh             |    6 +++---
 11 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/beast-gtk/bstmain.cc b/beast-gtk/bstmain.cc
index 1442118..e1f3fa8 100644
--- a/beast-gtk/bstmain.cc
+++ b/beast-gtk/bstmain.cc
@@ -640,7 +640,7 @@ bst_args_process (int *argc_p, char **argv)
          else if (strcmp (arg, "ladspa") == 0)
            printout ("%s\n", bse_installpath (BSE_INSTALLPATH_LADSPA).c_str());
          else if (strcmp (arg, "plugins") == 0)
-           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_PKGLIBDIR_PLUGINS).c_str());
+           printout ("%s\n", bse_installpath (BSE_INSTALLPATH_BSELIBDIR_PLUGINS).c_str());
          else if (strcmp (arg, "samples") == 0)
            printout ("%s\n", bse_server.get_sample_path());
          else if (strcmp (arg, "effects") == 0)
diff --git a/bse/bseplugin.cc b/bse/bseplugin.cc
index 7770011..c697de9 100644
--- a/bse/bseplugin.cc
+++ b/bse/bseplugin.cc
@@ -733,16 +733,16 @@ bse_plugin_path_list_files (gboolean include_drivers,
     {
       if (include_drivers)
         {
-          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_PKGLIBDIR_DRIVERS).c_str(), 
"*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
+          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_BSELIBDIR_DRIVERS).c_str(), 
"*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
           ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
-          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_PKGLIBDIR_DRIVERS).c_str(), 
"*.o", G_FILE_TEST_IS_REGULAR);
+          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_BSELIBDIR_DRIVERS).c_str(), 
"*.o", G_FILE_TEST_IS_REGULAR);
           ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
         }
       if (include_plugins)
         {
-          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_PKGLIBDIR_PLUGINS).c_str(), 
"*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
+          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_BSELIBDIR_PLUGINS).c_str(), 
"*" PLUGIN_EXTENSION, G_FILE_TEST_IS_REGULAR);
           ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
-          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_PKGLIBDIR_PLUGINS).c_str(), 
"*.o", G_FILE_TEST_IS_REGULAR);
+          files = sfi_file_crawler_list_files (bse_installpath (BSE_INSTALLPATH_BSELIBDIR_PLUGINS).c_str(), 
"*.o", G_FILE_TEST_IS_REGULAR);
           ring = sfi_ring_concat (ring, sfi_ring_sort (files, (SfiCompareFunc) strcmp, NULL));
         }
       if (include_plugins && BSE_GCONFIG (plugin_path) && BSE_GCONFIG (plugin_path)[0])
diff --git a/bse/bseserver.cc b/bse/bseserver.cc
index 3021be8..486e437 100644
--- a/bse/bseserver.cc
+++ b/bse/bseserver.cc
@@ -1163,7 +1163,7 @@ ServerImpl::get_ladspa_path ()
 String
 ServerImpl::get_plugin_path ()
 {
-  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_PKGLIBDIR_PLUGINS), BSE_GCONFIG 
(plugin_path));
+  return Path::searchpath_join (bse_installpath (BSE_INSTALLPATH_BSELIBDIR_PLUGINS), BSE_GCONFIG 
(plugin_path));
 }
 
 String
diff --git a/configure.ac b/configure.ac
index a56714a..f46a665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,12 +80,12 @@ fi
 AC_SUBST(DEFINE__FILE_DIR__)
 
 # Define package directories per major/minor version
-pkglibdir="\${libdir}/beast-$MAJOR"
+bselibdir="\${libdir}/bse-$MAJOR"
 pkglibexecdir="\${libexecdir}/beast-$MAJOR"
 pkgdatadir="\${datadir}/beast-$MAJOR"
 pkgdocdir="\${datarootdir}/doc/beast-$MAJOR"
 # Substitute directories in Makefiles
-AC_SUBST(pkglibdir)
+AC_SUBST(bselibdir)
 AC_SUBST(pkglibexecdir)
 AC_SUBST(pkgdatadir)
 AC_SUBST(pkgdocdir)
@@ -97,7 +97,7 @@ AC_DEFINE_UNQUOTED(INSTALLPATH_INCLUDES, ["`eval echo "${includedir}"`"], [Base
 AC_DEFINE_UNQUOTED(INSTALLPATH_BINDIR, ["`eval echo "${bindir}"`"], [Directory to install and execute 
programs])
 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_PKGLIBDIR, ["`eval echo ${pkglibdir}`"], [Directory to install plugins and 
drivers])
+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_PKGDOCDIR, ["`eval echo ${pkgdocdir}`"], [Directory to install documentation])
 AC_DEFINE_UNQUOTED(INSTALLPATH_USER_DATA, ["~/beast"], [Searchpath for user owned Beast resources])
diff --git a/data/bse.pc.in b/data/bse.pc.in
index bd7fee5..608bfb5 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -10,8 +10,8 @@ sfidl= exec_prefix@/sfidl
 demodir= pkgdatadir@/demo
 sampledir= pkgdatadir@/samples
 scriptdir= pkgdatadir@/scripts
-plugindir= pkglibdir@/plugins
-driverdir= pkglibdir@/drivers
+plugindir= bselibdir@/plugins
+driverdir= bselibdir@/drivers
 effectdir= pkgdatadir@/effects
 instrumentdir= pkgdatadir@/instruments
 
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
index 0e111c9..00d9825 100644
--- a/drivers/Makefile.am
+++ b/drivers/Makefile.am
@@ -6,7 +6,7 @@ DEFS        += @DEFINE__FILE_DIR__@ $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # Plugin bsedevice-alsa
-driversdir          = $(pkglibdir)/drivers
+driversdir          = $(bselibdir)/drivers
 drivers_LTLIBRARIES = bsepcmdevice-alsa.la bsemididevice-alsa.la
 drivers_ldflags     = -avoid-version
 drivers_libs        = $(top_builddir)/bse/libbse- MAJOR@.la $(BSE_LIBS) $(SFI_LIBS) $(RAPICORN_LIBS)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 1e5c389..569c837 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -62,13 +62,13 @@ CLEANFILES           += $(plugins_built_sources)
 # .FPU plugins
 plugin_FPU_ltlibs        =     # listed in Makefile.plugins
 plugin_FPU_LTLIBRARIES   = $(plugin_FPU_ltlibs) cxxplugins.FPU.la
-plugin_FPUdir            = $(pkglibdir)/plugins
+plugin_FPUdir            = $(bselibdir)/plugins
 FPU_PLUGIN_CFLAGS        = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 FPU_PLUGIN_CXXFLAGS      = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 # .SSE plugins
 plugin_SSE_ltlibs        =     # listed in Makefile.plugins
 plugin_SSE_LTLIBRARIES   = $(plugin_SSE_cond_libs) cxxplugins.SSE.la
-plugin_SSEdir            = $(pkglibdir)/plugins
+plugin_SSEdir            = $(bselibdir)/plugins
 SSE_PLUGIN_CFLAGS        = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(MMX_SSE_FLAGS)
 SSE_PLUGIN_CXXFLAGS      = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(MMX_SSE_FLAGS)
 if WITH_MMX_SSE
diff --git a/plugins/evaluator/Makefile.am b/plugins/evaluator/Makefile.am
index fb0be34..dde1f37 100644
--- a/plugins/evaluator/Makefile.am
+++ b/plugins/evaluator/Makefile.am
@@ -15,7 +15,7 @@ include $(top_srcdir)/Makefile.decl
 #AM_CPPFLAGS += -DBSE_PLUGIN_FALLBACK="\"$(strip $(basename $(<F)))\""
 #
 ## install plugins under:
-#plugindir = $(pkglibdir)/plugins
+#plugindir = $(bselibdir)/plugins
 #
 ## setup generation of C++ plugins from idl files
 #SFIDL = ../../sfi/sfidl
diff --git a/plugins/freeverb/Makefile.am b/plugins/freeverb/Makefile.am
index 7125860..58a90a7 100644
--- a/plugins/freeverb/Makefile.am
+++ b/plugins/freeverb/Makefile.am
@@ -6,7 +6,7 @@ DEFS        += @DEFINE__FILE_DIR__@ -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))
 AM_CXXFLAGS += $(BSE_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENIENCE
 
 # install plugins under:
-plugindir = $(pkglibdir)/plugins
+plugindir = $(bselibdir)/plugins
 
 freeverb_la_SOURCES = allpass.cpp comb.cpp revmodel.cpp bsefreeverbcpp.cpp bsefreeverb.cc
 freeverb_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version
diff --git a/sfi/glib-extra.cc b/sfi/glib-extra.cc
index 5a4d46e..960b5ca 100644
--- a/sfi/glib-extra.cc
+++ b/sfi/glib-extra.cc
@@ -1039,9 +1039,9 @@ bse_installpath (BseInstallpathType installpath_type)
     case BSE_INSTALLPATH_LADSPA:                        return INSTALLPATH_LADSPA;
     case BSE_INSTALLPATH_PKGDOCDIR:                     return INSTALLPATH_PKGDOCDIR;
     case BSE_INSTALLPATH_USER_DATA:                     return INSTALLPATH_USER_DATA;
-    case BSE_INSTALLPATH_PKGLIBDIR:                     return INSTALLPATH_PKGLIBDIR;
-    case BSE_INSTALLPATH_PKGLIBDIR_PLUGINS:             return bse_installpath (BSE_INSTALLPATH_PKGLIBDIR) + 
"/plugins";
-    case BSE_INSTALLPATH_PKGLIBDIR_DRIVERS:             return bse_installpath (BSE_INSTALLPATH_PKGLIBDIR) + 
"/drivers";
+    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";
diff --git a/sfi/glib-extra.hh b/sfi/glib-extra.hh
index eac069d..c136ec7 100644
--- a/sfi/glib-extra.hh
+++ b/sfi/glib-extra.hh
@@ -312,9 +312,9 @@ enum BseInstallpathType {
   BSE_INSTALLPATH_LADSPA,
   BSE_INSTALLPATH_PKGDOCDIR,
   BSE_INSTALLPATH_USER_DATA,
-  BSE_INSTALLPATH_PKGLIBDIR,
-  BSE_INSTALLPATH_PKGLIBDIR_PLUGINS,
-  BSE_INSTALLPATH_PKGLIBDIR_DRIVERS,
+  BSE_INSTALLPATH_BSELIBDIR,
+  BSE_INSTALLPATH_BSELIBDIR_PLUGINS,
+  BSE_INSTALLPATH_BSELIBDIR_DRIVERS,
   BSE_INSTALLPATH_PKGDATADIR,
   BSE_INSTALLPATH_PKGDATADIR_DEMO,
   BSE_INSTALLPATH_PKGDATADIR_SAMPLES,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]