diff options
| author | jgrandy <jgrandy@authentic8.com> | 2013-07-28 13:07:24 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:55:31 -0700 |
| commit | 26ae5a60a8c8e76e784477713f08eee4e8bba105 (patch) | |
| tree | 6aab3d401d9084afbd9cc2e1d3fee871b2457e40 | |
| parent | 2c70a0e1f894b26c3aa40fcb160807088630bec9 (diff) | |
| download | xrdp-proprietary-26ae5a60a8c8e76e784477713f08eee4e8bba105.tar.gz xrdp-proprietary-26ae5a60a8c8e76e784477713f08eee4e8bba105.zip | |
Merge: add /opt/xrdp/lib to rpath in xrdp, for libfreerdp
| -rw-r--r-- | xrdp/Makefile.am | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index ac3b7fe0..83d04a6c 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -1,11 +1,20 @@ EXTRA_DIST = xrdp.ini ad24b.bmp ad256.bmp xrdp24b.bmp xrdp256.bmp sans-10.fv1 cursor0.cur cursor1.cur xrdp.h xrdp_types.h +EXTRA_INCLUDES = +EXTRA_LIBS = +EXTRA_FLAGS = + if XRDP_DEBUG EXTRA_DEFINES = -DXRDP_DEBUG else EXTRA_DEFINES = -DXRDP_NODEBUG endif +if GOT_PREFIX +EXTRA_INCLUDES += -I$(prefix)/include +EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib +endif + AM_CFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ @@ -17,7 +26,8 @@ AM_CFLAGS = \ INCLUDES = \ -I$(top_builddir) \ -I$(top_srcdir)/common \ - -I$(top_srcdir)/libxrdp + -I$(top_srcdir)/libxrdp \ + $(EXTRA_INCLUDES) sbin_PROGRAMS = \ xrdp @@ -41,6 +51,9 @@ xrdp_LDADD = \ $(top_builddir)/common/libcommon.la \ $(top_builddir)/libxrdp/libxrdp.la +xrdp_LDFLAGS = \ + $(EXTRA_FLAGS) + xrdpsysconfdir=$(sysconfdir)/xrdp xrdpsysconf_DATA = \ |