aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-02-06 07:47:59 +0800
committerDan Winship <danw@src.gnome.org>2003-02-06 07:47:59 +0800
commit9a08dd45d329cf425f15a3ccc63463a9b489340f (patch)
tree35bac5bce67c3542b46e64cb4d3f1303d9a2a8ec
parent8b4423c10c7e8168e4512c8a2522ffdb392453f3 (diff)
downloadgsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.tar
gsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.tar.gz
gsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.tar.bz2
gsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.tar.lz
gsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.tar.xz
gsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.tar.zst
gsoc2013-evolution-9a08dd45d329cf425f15a3ccc63463a9b489340f.zip
Remove cruft. Define in terms of privdatadir
* gui/merging/Makefile.am (INCLUDES): Remove cruft. * gui/search/Makefile.am (ruledir): Define in terms of privdatadir svn path=/trunk/; revision=19783
-rw-r--r--addressbook/gui/merging/Makefile.am2
-rw-r--r--addressbook/gui/search/Makefile.am2
2 files changed, 1 insertions, 3 deletions
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
index 2e239e5ae6..4c57316e8c 100644
--- a/addressbook/gui/merging/Makefile.am
+++ b/addressbook/gui/merging/Makefile.am
@@ -1,7 +1,6 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"e-card-gui\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
@@ -19,7 +18,6 @@ libecardmerging_a_SOURCES = \
e-card-merging.h
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
glade_DATA = e-card-duplicate-detected.glade \
e-card-merging-book-commit-duplicate-detected.glade
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index 65d7cb2f79..bdf90e99ea 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -1,4 +1,4 @@
-ruledir = $(datadir)/evolution-$(BASE_VERSION)
+ruledir = $(privdatadir)
rule_DATA = addresstypes.xml
EXTRA_DIST = addresstypes.xml