diff options
| author | jsorg71 <jsorg71> | 2009-05-19 04:23:49 +0000 |
|---|---|---|
| committer | jsorg71 <jsorg71> | 2009-05-19 04:23:49 +0000 |
| commit | 23ffdb0c5fe0315d9d237f168e7d72abe0ba422c (patch) | |
| tree | 9c565ce9f75c1aab5329837d209af63a9dd74a54 /common | |
| parent | a386eac0f931716e421e20a7cc07c2f0b4e70a2f (diff) | |
| download | xrdp-proprietary-23ffdb0c5fe0315d9d237f168e7d72abe0ba422c.tar.gz xrdp-proprietary-23ffdb0c5fe0315d9d237f168e7d72abe0ba422c.zip | |
autotools fix and file_loc.h simplified
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.am | 7 | ||||
| -rw-r--r-- | common/file_loc.h | 24 |
2 files changed, 9 insertions, 22 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 8107e97b..c7d4590f 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,3 +1,10 @@ + +AM_CFLAGS = \ + -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ + -DXRDP_SBIN_PATH=\"${sbindir}\" \ + -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ + -DXRDP_PID_PATH=\"${localstatedir}/run\" + lib_LTLIBRARIES = \ libcommon.la diff --git a/common/file_loc.h b/common/file_loc.h index d1295aa7..11aeb722 100644 --- a/common/file_loc.h +++ b/common/file_loc.h @@ -27,20 +27,8 @@ #define XRDP_CFG_PATH "/etc/xrdp" #endif -#if !defined(XRDP_CFG_FILE) -#define XRDP_CFG_FILE "/etc/xrdp/xrdp.ini" -#endif - -#if !defined(XRDP_KEY_FILE) -#define XRDP_KEY_FILE "/etc/xrdp/rsakeys.ini" -#endif - -#if !defined(XRDP_KEYMAP_FILE) -#define XRDP_KEYMAP_FILE "/etc/xrdp/km-%4.4x.ini" -#endif - -#if !defined(XRDP_PID_FILE) -#define XRDP_PID_FILE "/var/run/xrdp.pid" +#if !defined(XRDP_PID_PATH) +#define XRDP_PID_PATH "/var/run" #endif #if !defined(XRDP_SBIN_PATH) @@ -51,12 +39,4 @@ #define XRDP_SHARE_PATH "/usr/local/share/xrdp" #endif -#if !defined(SESMAN_PID_FILE) -#define SESMAN_PID_FILE "/var/run/sesman.pid" -#endif - -#if !defined(SESMAN_CFG_FILE) -#define SESMAN_CFG_FILE "/etc/xrdp/sesman.ini" -#endif - #endif |