From 8790e14c4b775cd068b0c7da1f9fe9b3bf086378 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Thu, 6 Feb 2003 16:45:55 +0000
Subject: subst in $(toolsdir) instead of $(bindir)

        * tools/Makefile.am: subst in $(toolsdir) instead of $(bindir)

        * tools/evolution-addressbook-clean.in:
        s/EVOLUTION_BINDIR/EVOLUTION_TOOLSDIR/

svn path=/trunk/; revision=19809
---
 tools/Makefile.am                    | 9 ++++-----
 tools/evolution-addressbook-clean.in | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e8b5717976..e002d53d5a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
-toolsdir = $(datadir)/evolution-$(BASE_VERSION)/tools
+toolsdir = $(privdatadir)/tools
 
 tools_SCRIPTS =				\
 	csv2vcard			\
@@ -16,7 +16,6 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"evolution-tools\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
-	-DEVOLUTION_BINDIR=\""$(bindir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DPREFIX=\""$(prefix)"\"			\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
@@ -40,10 +39,10 @@ evolution_addressbook_import_LDADD =				\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/menus/libmenus.la
 
-evolution_addressbook_export_LDADD =					\
+evolution_addressbook_export_LDADD =				\
 	$(evolution_addressbook_import_LDADD)
 
-evolution_addressbook_abuse_LDADD =					\
+evolution_addressbook_abuse_LDADD =				\
 	$(evolution_addressbook_import_LDADD)
 
 CLEANFILES = evolution-addressbook-clean
@@ -51,6 +50,6 @@ CLEANFILES = evolution-addressbook-clean
 
 evolution-addressbook-clean: evolution-addressbook-clean.in Makefile
 ## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\@EVOLUTION_BINDIR\@?$(bindir)?g' \
+	sed -e 's?\@EVOLUTION_TOOLSDIR\@?$(toolsdir)?g' \
 	   < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \
 	  && mv evolution-addressbook-clean.tmp evolution-addressbook-clean
diff --git a/tools/evolution-addressbook-clean.in b/tools/evolution-addressbook-clean.in
index ec407296da..b7ee7ba167 100644
--- a/tools/evolution-addressbook-clean.in
+++ b/tools/evolution-addressbook-clean.in
@@ -9,7 +9,7 @@ sub do_system
     }
 }
 
-$filename = `@EVOLUTION_BINDIR@/evolution-addressbook-export`;
+$filename = `@EVOLUTION_TOOLSDIR@/evolution-addressbook-export`;
 if ($? != 0) {
     $! = $?;
     die $!;
@@ -17,8 +17,8 @@ if ($? != 0) {
 
 $HOME = $ENV{"HOME"};
 
-system ("@EVOLUTION_BINDIR@/killev");
+system ("@EVOLUTION_TOOLSDIR@/killev");
 do_system ("/bin/mv ${HOME}/evolution/local/Contacts/addressbook.db ${HOME}/evolution/local/Contacts/addressbook-backup.db");
-do_system ("@EVOLUTION_BINDIR@/evolution-addressbook-import --input-file $filename");
+do_system ("@EVOLUTION_TOOLSDIR@/evolution-addressbook-import --input-file $filename");
 do_system ("/bin/rm $filename");
 
-- 
cgit v1.2.3