From 3e0211a7d2b5a6b585f53addff3bc24f7cfb73b0 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 5 Feb 2003 22:34:18 +0000 Subject: Define in terms of privincludedir. (camellibexecdir): Define in terms of * Makefile.am (libcamelincludedir): Define in terms of privincludedir. (camellibexecdir): Define in terms of privlibexecdir (libcamel_la_LDFLAGS): Remove -rpath. (automake will add that) * providers/imap/Makefile.am (libcamelimapincludedir): Define in terms of privincludedir. (INCLUDES): Remove -I$(includedir) * providers/local/Makefile.am: Likewise * providers/nntp/Makefile.am: Likewise * providers/pop3/Makefile.am: Likewise * providers/sendmail/Makefile.am: Likewise * providers/smtp/Makefile.am: Likewise svn path=/trunk/; revision=19775 --- camel/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'camel/Makefile.am') diff --git a/camel/Makefile.am b/camel/Makefile.am index 97f445024c..119798b233 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = . providers tests -libcamelincludedir = $(includedir)/evolution-$(BASE_VERSION)/camel +libcamelincludedir = $(privincludedir)/camel -camellibexecdir = $(libexecdir)/evolution/$(BASE_VERSION)/camel/ +camellibexecdir = $(privlibexecdir)/camel camellibexec_PROGRAMS = camel-lock-helper camel-index-control privlib_LTLIBRARIES = libcamel.la @@ -221,7 +221,7 @@ libcamelinclude_HEADERS = \ camel.h \ string-utils.h -libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) +libcamel_la_LDFLAGS = -version-info 0:0:0 libcamel_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ -- cgit