diff options
author | Pavel Roskin <plroskin@gmail.com> | 2016-02-10 10:24:09 -0800 |
---|---|---|
committer | Pavel Roskin <plroskin@gmail.com> | 2016-02-12 23:52:46 -0800 |
commit | dcab7552db2af346724c5090e529950b32a7076d (patch) | |
tree | 64c7b237ed4a44e945d48b366df4d7bbe337ac40 /common | |
parent | ffc4efb9ce09ccc370571793607b19193d8cb15b (diff) | |
download | xrdp-proprietary-dcab7552db2af346724c5090e529950b32a7076d.tar.gz xrdp-proprietary-dcab7552db2af346724c5090e529950b32a7076d.zip |
Stop redefining libdir, use moduledir for ${libdir}/xrdp
libdir is for shared and static libraries. Some xrdp libraries are loaded
dynamically from a non-standard directory, so they are used like modules.
Having separate libdir and moduledir would eventually allow to separate
dynamically loaded modules from shared libraries.
Diffstat (limited to 'common')
-rw-r--r-- | common/Makefile.am | 2 | ||||
-rw-r--r-- | common/file_loc.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index c8501586..cc72b22b 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -DXRDP_LOG_PATH=\"${localstatedir}/log\" -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libcommon.la libcommon_la_SOURCES = \ diff --git a/common/file_loc.h b/common/file_loc.h index 7389a1ed..8f5146cb 100644 --- a/common/file_loc.h +++ b/common/file_loc.h @@ -37,8 +37,8 @@ #define XRDP_SHARE_PATH "/usr/local/share/xrdp" #endif -#if !defined(XRDP_LIB_PATH) -#define XRDP_LIB_PATH "/usr/local/lib/xrdp" +#if !defined(XRDP_MODULE_PATH) +#define XRDP_MODULE_PATH "/usr/local/lib/xrdp" #endif #if !defined(XRDP_LOG_PATH) |