summaryrefslogtreecommitdiffstats
path: root/libxrdp
diff options
context:
space:
mode:
authorItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-02-08 22:37:44 -0200
committerItamar Reis Peixoto <itamar@ispbrasil.com.br>2016-02-08 22:37:44 -0200
commitee436aeec9385a77cb547384575bcc2f9ad2746c (patch)
treed7fc2f98e36a9c06713284e450ad9bf98653346e /libxrdp
parent40a197e7a8960fdaefb1e4bd90344c5734bd9e77 (diff)
parent2a5d204baaa84207e835af570d89b10a17083fae (diff)
downloadxrdp-proprietary-ee436aeec9385a77cb547384575bcc2f9ad2746c.tar.gz
xrdp-proprietary-ee436aeec9385a77cb547384575bcc2f9ad2746c.zip
Merge pull request #309 from proski/devel
Fixes for autotools, compile warnings and MacOS compatibility
Diffstat (limited to 'libxrdp')
-rw-r--r--libxrdp/Makefile.am11
1 files changed, 2 insertions, 9 deletions
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am
index ec92f8be..5b89b0c3 100644
--- a/libxrdp/Makefile.am
+++ b/libxrdp/Makefile.am
@@ -28,19 +28,12 @@ EXTRA_LIBS += -ljpeg
endif
endif
-if GOT_PREFIX
-EXTRA_INCLUDES += -I$(prefix)/include
-EXTRA_FLAGS += -L$(prefix)/lib -Wl,-rpath -Wl,$(prefix)/lib
-endif
-
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
-DXRDP_SBIN_PATH=\"${sbindir}\" \
-DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
-DXRDP_PID_PATH=\"${localstatedir}/run\" \
- $(EXTRA_DEFINES)
-
-INCLUDES = \
+ $(EXTRA_DEFINES) \
-I$(top_srcdir)/common \
$(EXTRA_INCLUDES)