From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- plugins/default-mailer/Makefile.am | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'plugins/default-mailer/Makefile.am') diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 72a74dbe8a..45f4e29c2b 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -12,7 +12,10 @@ plugin_DATA = org-gnome-default-mailer.eplug plugin_LTLIBRARIES = liborg-gnome-default-mailer.la liborg_gnome_default_mailer_la_SOURCES = default-mailer.c -liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version +liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_default_mailer_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in @@ -20,12 +23,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif EXTRA_DIST = \ org-gnome-default-mailer.eplug.xml \ -- cgit