aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-01-23 04:33:53 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-01-23 04:33:53 +0800
commita07108638cd18868143c9397462725ce730dc81d (patch)
tree43c47679c3caa1a75573d119f03c828090a5dd95
parentd07eb533340cc7d339fe5c492e80b491244fa22c (diff)
downloadgsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.tar
gsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.tar.gz
gsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.tar.bz2
gsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.tar.lz
gsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.tar.xz
gsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.tar.zst
gsoc2013-evolution-a07108638cd18868143c9397462725ce730dc81d.zip
(gladedir): Version using
$(BASE_VERSION). (INCLUDES): Update the MAP_DIR define with versioning. svn path=/trunk/; revision=19567
-rw-r--r--widgets/ChangeLog6
-rw-r--r--widgets/e-timezone-dialog/Makefile.am16
2 files changed, 14 insertions, 8 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index a54bafcbea..7d21c67dcd 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-22 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-timezone-dialog/Makefile.am (gladedir): Version using
+ $(BASE_VERSION).
+ (INCLUDES): Update the MAP_DIR define with versioning.
+
2003-01-08 Ettore Perazzoli <ettore@ximian.com>
* e-timezone-dialog/Makefile.am: Images are now in
diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am
index 7a256159cb..8552c2fa6e 100644
--- a/widgets/e-timezone-dialog/Makefile.am
+++ b/widgets/e-timezone-dialog/Makefile.am
@@ -1,10 +1,10 @@
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/libical/src/libical \
- -I$(top_builddir)/libical/src/libical \
- -DMAP_DIR=\""$(datadir)/evolution/images"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DG_LOG_DOMAIN=__FILE__ \
+INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
+ -DMAP_DIR=\""$(datadir)/evolution-$(BASE_VERSION)/images"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DG_LOG_DOMAIN=__FILE__ \
$(GNOME_FULL_CFLAGS)
noinst_LIBRARIES = \
@@ -14,7 +14,7 @@ libetimezonedialog_a_SOURCES = \
e-timezone-dialog.c \
e-timezone-dialog.h
-gladedir = $(datadir)/evolution/glade
+gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = e-timezone-dialog.glade
EXTRA_DIST = $(glade_DATA)