jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: add /opt/xrdp/lib to rpath in xrdp, for libfreerdp

Browse Source
This commit is contained in:
jgrandy 2013-07-28 13:07:24 -07:00 committed by Jim Grandy
parent 2c70a0e1f8
commit 26ae5a60a8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xrdp/Makefile.am
View File

@ -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_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 if XRDP_DEBUG
EXTRA_DEFINES = -DXRDP_DEBUG EXTRA_DEFINES = -DXRDP_DEBUG
else else
EXTRA_DEFINES = -DXRDP_NODEBUG EXTRA_DEFINES = -DXRDP_NODEBUG
endif endif
if GOT_PREFIX
EXTRA_INCLUDES += -I$(prefix)/include
EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
endif
AM_CFLAGS = \ AM_CFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SBIN_PATH=\"${sbindir}\" \
@ -17,7 +26,8 @@ AM_CFLAGS = \
INCLUDES = \ INCLUDES = \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_srcdir)/libxrdp -I$(top_srcdir)/libxrdp \
$(EXTRA_INCLUDES)
sbin_PROGRAMS = \ sbin_PROGRAMS = \
xrdp xrdp
@ -41,6 +51,9 @@ xrdp_LDADD = \
$(top_builddir)/common/libcommon.la \ $(top_builddir)/common/libcommon.la \
$(top_builddir)/libxrdp/libxrdp.la $(top_builddir)/libxrdp/libxrdp.la
xrdp_LDFLAGS = \
$(EXTRA_FLAGS)
xrdpsysconfdir=$(sysconfdir)/xrdp xrdpsysconfdir=$(sysconfdir)/xrdp
xrdpsysconf_DATA = \ xrdpsysconf_DATA = \