diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/evolution-addressbook-clean.in | 6 |
3 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,10 @@ +2003-02-06 Dan Winship <danw@ximian.com> + + * tools/Makefile.am: subst in $(toolsdir) instead of $(bindir) + + * tools/evolution-addressbook-clean.in: + s/EVOLUTION_BINDIR/EVOLUTION_TOOLSDIR/ + 2003-02-05 Dan Winship <danw@ximian.com> * configure.in: Define and AC_SUBST privlibexecdir, privdatadir, 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"); |