aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-02-06 07:47:12 +0800
committerDan Winship <danw@src.gnome.org>2003-02-06 07:47:12 +0800
commit3dd0e5884e06ec8a5376362da694a487b27b8ca6 (patch)
tree12809702799aafbd606a15a59141878b6ab45fe0
parentd8eca23e1012bafe459a339f59915cd2518b070d (diff)
downloadgsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.tar
gsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.tar.gz
gsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.tar.bz2
gsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.tar.lz
gsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.tar.xz
gsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.tar.zst
gsoc2013-evolution-3dd0e5884e06ec8a5376362da694a487b27b8ca6.zip
Define in terms of privdatadir. (gladedir): Defined in configure.in now.
* printing/Makefile.am (ecpsdir): Define in terms of privdatadir. (gladedir): Defined in configure.in now. * printing/e-contact-print.c: #include <string.h> * printing/test-print.c: #include <bonobo/bonobo-main.h> * printing/test-contact-print-style-editor.c: Likewise svn path=/trunk/; revision=19780
-rw-r--r--addressbook/printing/Makefile.am6
-rw-r--r--addressbook/printing/e-contact-print.c1
-rw-r--r--addressbook/printing/test-contact-print-style-editor.c1
-rw-r--r--addressbook/printing/test-print.c1
4 files changed, 4 insertions, 5 deletions
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index bafa872241..67868ac237 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -1,12 +1,9 @@
-ecpsdir = $(datadir)/evolution-$(BASE_VERSION)/ecps
-
+ecpsdir = $(privdatadir)/ecps
ecps_DATA = \
smallbook.ecps \
medbook.ecps \
phonelist.ecps
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
-
glade_DATA = \
e-contact-print.glade
@@ -19,7 +16,6 @@ INCLUDES = \
-I$(top_srcdir) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index c0f97fbf5d..e3f79099bb 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -25,6 +25,7 @@
#include <ctype.h>
#include <sys/types.h>
#include <stdlib.h>
+#include <string.h>
#include <glib.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
index 774ae9f7b0..f49625434e 100644
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ b/addressbook/printing/test-contact-print-style-editor.c
@@ -25,6 +25,7 @@
#include <gtk/gtkmain.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-ui-init.h>
+#include <bonobo/bonobo-main.h>
#include "e-contact-print-style-editor.h"
/* This is a horrible thing to do, but it is just a test. */
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index 765ca10743..a1dede7bde 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -26,6 +26,7 @@
#include <libgnomeui/gnome-dialog.h>
#include <libgnomeui/gnome-ui-init.h>
#include <glade/glade.h>
+#include <bonobo/bonobo-main.h>
#include "e-contact-print.h"
/* This is a horrible thing to do, but it is just a test. */