diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/tools/Makefile.am | 15 | ||||
| -rw-r--r-- | addressbook/tools/evolution-addressbook-clean.in | 24 |
2 files changed, 2 insertions, 37 deletions
diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index 26ead07ac5..4d2e6d4746 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -1,6 +1,5 @@ privlibexec_SCRIPTS = \ - csv2vcard \ - evolution-addressbook-clean + csv2vcard privlibexec_PROGRAMS = evolution-addressbook-export @@ -31,16 +30,6 @@ if OS_WIN32 evolution_addressbook_export_LDFLAGS = -mwindows endif -EXTRA_DIST = $(privlibexec_SCRIPTS) \ - evolution-addressbook-clean.in - -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_TOOLSDIR\@?$(privlibexecdir)?g' \ - -e 's?\@PERL\@?@PERL@?g' \ - < $(srcdir)/evolution-addressbook-clean.in > evolution-addressbook-clean.tmp \ - && mv evolution-addressbook-clean.tmp evolution-addressbook-clean +EXTRA_DIST = $(privlibexec_SCRIPTS) -include $(top_srcdir)/git.mk diff --git a/addressbook/tools/evolution-addressbook-clean.in b/addressbook/tools/evolution-addressbook-clean.in deleted file mode 100644 index 49a5c3b665..0000000000 --- a/addressbook/tools/evolution-addressbook-clean.in +++ /dev/null @@ -1,24 +0,0 @@ -#!@PERL@ -w - -sub do_system -{ - my ($command) = @_; - system ($command); - if ($? != 0) { - die "Command failed: $command"; - } -} - -$filename = `@EVOLUTION_TOOLSDIR@/evolution-addressbook-export`; -if ($? != 0) { - $! = $?; - die $!; -} - -$HOME = $ENV{"HOME"}; - -system ("@EVOLUTION_TOOLSDIR@/killev"); -do_system ("/bin/mv ${HOME}/.evolution/addressbook/local/system/addressbook.db ${HOME}/.evolution/addressbook/local/system/addressbook-backup.db"); -do_system ("@EVOLUTION_TOOLSDIR@/evolution-addressbook-import --input-file $filename"); -do_system ("/bin/rm $filename"); - |