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.

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 = \

common/file_loc.h

@@ -37,8 +37,8 @@
 #define XRDP_SHARE_PATH "/usr/local/share/xrdp"
 #endif
 
-#if !defined(XRDP_LIB_PATH)
+#if !defined(XRDP_MODULE_PATH)
-#define XRDP_LIB_PATH "/usr/local/lib/xrdp"
+#define XRDP_MODULE_PATH "/usr/local/lib/xrdp"
 #endif
 
 #if !defined(XRDP_LOG_PATH)

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";

libxrdp/Makefile.am

@@ -37,7 +37,7 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/common \
   $(EXTRA_INCLUDES)
 
-lib_LTLIBRARIES = \
+module_LTLIBRARIES = \
   libxrdp.la
 
 libxrdp_la_SOURCES = \

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

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

rdp/Makefile.am

@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
   $(EXTRA_DEFINES) \
   -I$(top_srcdir)/common
 
-lib_LTLIBRARIES = \
+module_LTLIBRARIES = \
   librdp.la
 
 librdp_la_SOURCES = \

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 = \

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

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 \

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);
 

xrdpapi/Makefile.am

@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
   $(EXTRA_DEFINES) \
   $(EXTRA_INCLUDES)
 
-lib_LTLIBRARIES = \
+module_LTLIBRARIES = \
   libxrdpapi.la
 
 libxrdpapi_la_SOURCES = \

xrdpvr/Makefile.am

@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
   $(EXTRA_DEFINES) \
   $(EXTRA_INCLUDES)
 
-lib_LTLIBRARIES = \
+module_LTLIBRARIES = \
   libxrdpvr.la
 
 libxrdpvr_la_SOURCES = \

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