From e860673f10fd166bb28c78f0535b0eac635f4aa9 Mon Sep 17 00:00:00 2001 From: Bharath Acharya Date: Tue, 12 Aug 2008 04:19:31 +0000 Subject: Have a check for OS_WIN32 and handle the schema data differently. make 2008-08-12 Bharath Acharya * Makefile.am: Have a check for OS_WIN32 and handle the schema * data differently. make install error on win32. svn path=/trunk/; revision=35961 --- plugins/mail-notification/ChangeLog | 5 +++++ plugins/mail-notification/Makefile.am | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'plugins/mail-notification') diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 7a42367563..81039caa5c 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,8 @@ +2008-08-12 Bharath Acharya + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + 2008-08-11 Matthew Barnes ** Fixes part of bug #546892 diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 86fc91cc11..80b4fbcc98 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -29,12 +29,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 BUILT_SOURCES = $(plugin_DATA) -- cgit v1.2.3