config_GetLibDir: return arch-dep package directory

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 4360fad7d632dfd5fddb07e2be7cd14389275f1e..e9f88f07e6238458a81fa0f14c82f6f2c45572cd 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -215,6 +215,7 @@ VLC_EXPORT( void,   config_ResetAll, ( vlc_object_t * ) );
 VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED );
 VLC_EXPORT(char *, config_GetDataDir, ( vlc_object_t * ) LIBVLC_USED);
 #define config_GetDataDir(a) config_GetDataDir(VLC_OBJECT(a))
+VLC_EXPORT(const char *, config_GetLibDir, ( void ) LIBVLC_USED);
 VLC_EXPORT(const char *, config_GetConfDir, ( void ) LIBVLC_USED);
 
 typedef enum vlc_userdir

diff --git a/src/Makefile.am b/src/Makefile.am
index 8468da07b2693fb4acb23f06e4393f29bcf3930e..05e3f141f7d6b9a184a4aacf6de4c524f71e05e9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,7 +192,8 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(vlclibdir)/modules\"
+       -DPKGLIBDIR=\"$(vlclibdir)\" \
+       -DPLUGIN_PATH=PKGLIBDIR\"/modules\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \

diff --git a/src/config/dirs.c b/src/config/dirs.c
index 189cc0816da86f1d507800a370af81b85da31666..22a5bdcab54f9fa0c4a07a7a50abebc1d45a96bf 100644 (file)
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -32,7 +32,7 @@
 
 #undef config_GetDataDir
 /**
- * Determines the shared data directory
+ * Determines the shared architecture-independent data directory
  *
  * @return a string or NULL. Use free() to release.
  */

diff --git a/src/config/dirs_macos.c b/src/config/dirs_macos.c
index 25fbd70d6bd5ed96747d86b9d6aa846c77fa5d5f..0a563d84a1ee0e270b0d8b4771dc2b541caa504c 100644 (file)
--- a/src/config/dirs_macos.c
+++ b/src/config/dirs_macos.c
@@ -59,6 +59,11 @@ char *config_GetDataDirDefault (void)
     return datadir;
 }
 
+const char *config_GetLibDir (void)
+{
+    abort ();
+}
+
 static char *config_GetHomeDir (void)
 {
     const char *home = getenv ("HOME");

diff --git a/src/config/dirs_xdg.c b/src/config/dirs_xdg.c
index 0f0d3e924c82916bec15406544727d2655dcdbfd..8dd92cf2c4f7ca28e43accb136856d3a1deb25fc 100644 (file)
--- a/src/config/dirs_xdg.c
+++ b/src/config/dirs_xdg.c
@@ -46,6 +46,16 @@ char *config_GetDataDirDefault (void)
     return strdup (DATA_PATH);
 }
 
+/**
+ * Determines the architecture-dependent data directory
+ *
+ * @return a string (always succeeds).
+ */
+const char *config_GetLibDir (void)
+{
+    return PKGLIBDIR;
+}
+
 /**
  * Determines the system configuration directory.
  *

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index d620078fc0daf75bf624670a3e45cde7042983fe..85da6f3eb335309497a86cfd0cfb60deb6b9dc24 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -55,6 +55,7 @@ config_ExistIntf
 config_FindConfig
 config_GetConfDir
 config_GetDataDir
+config_GetLibDir
 config_GetFloat
 config_GetUserDir
 config_GetInt

diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index 1053b3af9d72b344e594b649767ec1fc8ee8a6de..519de2af39a29bc63d3887cce2535857bd7f7c69 100644 (file)
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -49,6 +49,11 @@ char *config_GetDataDirDefault( void )
     return strdup (psz_vlcpath);
 }
 
+const char *config_GetLibDir (void)
+{
+    abort ();
+}
+
 const char *config_GetConfDir (void)
 {
     static char appdir[PATH_MAX] = "";