aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog10
-rw-r--r--e-util/Makefile.am8
-rw-r--r--e-util/ename/Makefile.am4
3 files changed, 16 insertions, 6 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 9492610fe1..3337c7b1d0 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am (eutilincludedir): Version using $(BASE_VERSION).
+ (econdincludedir): Likewise.
+ (edb3includedir): Likewise.
+ (imagesdir): Likewise.
+
+ * ename/Makefile.am: Install libename in $(privlibdir) and
+ $(includedir)/evolution-$(BASE_VERSION)/ename.
+
2003-01-17 Jeffrey Stedfast <fejj@ximian.com>
* e-account-list.c: Changed signal names to use - instead of _
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index bf83695167..59ebc99b14 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = . ename
-imagesdir = $(datadir)/evolution/images
+imagesdir = $(datadir)/evolution-$(BASE_VERSION)/images
-eutilincludedir = $(includedir)/evolution/e-util
-econdincludedir = $(includedir)/evolution/e-conduit
-edb3includedir = $(includedir)/evolution/e-db3util
+eutilincludedir = $(includedir)/evolution-$(BASE_VERSION)/e-util
+econdincludedir = $(includedir)/evolution-$(BASE_VERSION)/e-conduit
+edb3includedir = $(includedir)/evolution-$(BASE_VERSION)/e-db3util
INCLUDES = \
-I$(top_srcdir) \
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index aeec2d834f..697bd7779c 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -12,13 +12,13 @@ ename_libs = \
libename.la \
$(E_NAME_LIBS)
-lib_LTLIBRARIES = libename.la
+privlib_LTLIBRARIES = libename.la
libename_la_SOURCES = \
e-address-western.c \
e-name-western.c
-libenameincludedir = $(includedir)/ename
+libenameincludedir = $(includedir)/evolution-$(BASE_VERSION)/ename
libenameinclude_HEADERS = \
e-address-western.h \