diff options
| -rw-r--r-- | common/Makefile.am | 2 | ||||
| -rw-r--r-- | common/file_loc.h | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libxrdp/Makefile.am | 2 | ||||
| -rw-r--r-- | mc/Makefile.am | 2 | ||||
| -rw-r--r-- | neutrinordp/Makefile.am | 2 | ||||
| -rw-r--r-- | rdp/Makefile.am | 2 | ||||
| -rw-r--r-- | sesman/libscp/Makefile.am | 2 | ||||
| -rw-r--r-- | vnc/Makefile.am | 2 | ||||
| -rw-r--r-- | xrdp/Makefile.am | 2 | ||||
| -rw-r--r-- | xrdp/xrdp_mm.c | 2 | ||||
| -rw-r--r-- | xrdpapi/Makefile.am | 2 | ||||
| -rw-r--r-- | xrdpvr/Makefile.am | 2 | ||||
| -rw-r--r-- | xup/Makefile.am | 2 |
14 files changed, 16 insertions, 15 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) diff --git a/configure.ac b/configure.ac index af78a392..80fad1c3 100644 --- a/configure.ac +++ b/configure.ac @@ -226,7 +226,8 @@ AC_CHECK_HEADER([X11/extensions/Xrandr.h], [], CFLAGS="$save_CFLAGS" -libdir="${libdir}/xrdp"; +AC_SUBST([moduledir], '${libdir}/xrdp') + if test "x${prefix}" = "xNONE" ; then sysconfdir="/etc"; localstatedir="/var"; diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index 5b89b0c3..ade99c65 100644 --- a/libxrdp/Makefile.am +++ b/libxrdp/Makefile.am @@ -37,7 +37,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/common \ $(EXTRA_INCLUDES) -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libxrdp.la libxrdp_la_SOURCES = \ diff --git a/mc/Makefile.am b/mc/Makefile.am index f56dac5f..b636a09d 100644 --- a/mc/Makefile.am +++ b/mc/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libmc.la libmc_la_SOURCES = mc.c diff --git a/neutrinordp/Makefile.am b/neutrinordp/Makefile.am index 58fe9bc2..932ddc78 100644 --- a/neutrinordp/Makefile.am +++ b/neutrinordp/Makefile.am @@ -16,7 +16,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/common \ $(FREERDP_CFLAGS) -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libxrdpneutrinordp.la libxrdpneutrinordp_la_SOURCES = xrdp-neutrinordp.c xrdp-color.c diff --git a/rdp/Makefile.am b/rdp/Makefile.am index 6d23b287..72c31101 100644 --- a/rdp/Makefile.am +++ b/rdp/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS = \ $(EXTRA_DEFINES) \ -I$(top_srcdir)/common -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ librdp.la librdp_la_SOURCES = \ diff --git a/sesman/libscp/Makefile.am b/sesman/libscp/Makefile.am index 3172f2cb..627a3370 100644 --- a/sesman/libscp/Makefile.am +++ b/sesman/libscp/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libscp.la libscp_la_SOURCES = \ diff --git a/vnc/Makefile.am b/vnc/Makefile.am index a9a3aa14..9d37c6da 100644 --- a/vnc/Makefile.am +++ b/vnc/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libvnc.la libvnc_la_SOURCES = vnc.c diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index 308f01a4..f20cda69 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -22,7 +22,7 @@ AM_CPPFLAGS = \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ - -DXRDP_LIB_PATH=\"${libdir}\" \ + -DXRDP_MODULE_PATH=\"${moduledir}\" \ $(EXTRA_DEFINES) \ -I$(top_builddir) \ -I$(top_srcdir)/common \ diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 088b6676..64ebdaf4 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -357,7 +357,7 @@ xrdp_mm_setup_mod1(struct xrdp_mm *self) if (self->mod_handle == 0) { - g_snprintf(text, 255, "%s/%s", XRDP_LIB_PATH, lib); + g_snprintf(text, 255, "%s/%s", XRDP_MODULE_PATH, lib); /* Let the main thread load the lib,*/ self->mod_handle = g_xrdp_sync(xrdp_mm_sync_load, (tintptr)text, 0); diff --git a/xrdpapi/Makefile.am b/xrdpapi/Makefile.am index 8107ffeb..30001b2a 100644 --- a/xrdpapi/Makefile.am +++ b/xrdpapi/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ $(EXTRA_DEFINES) \ $(EXTRA_INCLUDES) -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libxrdpapi.la libxrdpapi_la_SOURCES = \ diff --git a/xrdpvr/Makefile.am b/xrdpvr/Makefile.am index f232ce41..0f2b7cbc 100644 --- a/xrdpvr/Makefile.am +++ b/xrdpvr/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ $(EXTRA_DEFINES) \ $(EXTRA_INCLUDES) -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libxrdpvr.la libxrdpvr_la_SOURCES = \ diff --git a/xup/Makefile.am b/xup/Makefile.am index d7017b42..7669a55f 100644 --- a/xup/Makefile.am +++ b/xup/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ -I$(top_srcdir)/common -lib_LTLIBRARIES = \ +module_LTLIBRARIES = \ libxup.la libxup_la_SOURCES = xup.c |