evolution r35961 - in trunk/plugins: attachment-reminder default-mailer email-custom-header mail-notification templates

From: abharath svn gnome org
To: svn-commits-list gnome org
Subject: evolution r35961 - in trunk/plugins: attachment-reminder default-mailer email-custom-header mail-notification templates
Date: Tue, 12 Aug 2008 04:19:31 +0000 (UTC)
Author: abharath
Date: Tue Aug 12 04:19:31 2008
New Revision: 35961
URL: http://svn.gnome.org/viewvc/evolution?rev=35961&view=rev

Log:
2008-08-12  Bharath Acharya  <abharath novell com>

        * Makefile.am: Have a check for OS_WIN32 and handle the schema
        * data differently. make install error on win32.



Modified:
   trunk/plugins/attachment-reminder/ChangeLog
   trunk/plugins/attachment-reminder/Makefile.am
   trunk/plugins/default-mailer/ChangeLog
   trunk/plugins/default-mailer/Makefile.am
   trunk/plugins/email-custom-header/ChangeLog
   trunk/plugins/email-custom-header/Makefile.am
   trunk/plugins/mail-notification/ChangeLog
   trunk/plugins/mail-notification/Makefile.am
   trunk/plugins/templates/ChangeLog
   trunk/plugins/templates/Makefile.am

Modified: trunk/plugins/attachment-reminder/Makefile.am
==============================================================================
--- trunk/plugins/attachment-reminder/Makefile.am	(original)
+++ trunk/plugins/attachment-reminder/Makefile.am	Tue Aug 12 04:19:31 2008
@@ -32,12 +32,25 @@
 
 @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-evolution-attachment-reminder.eplug.xml \
 	org-gnome-attachment-reminder.error.xml			\

Modified: trunk/plugins/default-mailer/Makefile.am
==============================================================================
--- trunk/plugins/default-mailer/Makefile.am	(original)
+++ trunk/plugins/default-mailer/Makefile.am	Tue Aug 12 04:19:31 2008
@@ -23,12 +23,25 @@
 
 @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	\

Modified: trunk/plugins/email-custom-header/Makefile.am
==============================================================================
--- trunk/plugins/email-custom-header/Makefile.am	(original)
+++ trunk/plugins/email-custom-header/Makefile.am	Tue Aug 12 04:19:31 2008
@@ -35,12 +35,25 @@
 
 @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
 
 glade_DATA =							\
 	org-gnome-email-custom-header.glade			\

Modified: trunk/plugins/mail-notification/Makefile.am
==============================================================================
--- trunk/plugins/mail-notification/Makefile.am	(original)
+++ trunk/plugins/mail-notification/Makefile.am	Tue Aug 12 04:19:31 2008
@@ -29,12 +29,25 @@
 
 @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)
 

Modified: trunk/plugins/templates/Makefile.am
==============================================================================
--- trunk/plugins/templates/Makefile.am	(original)
+++ trunk/plugins/templates/Makefile.am	Tue Aug 12 04:19:31 2008
@@ -27,12 +27,25 @@
 
 @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-templates.eplug.xml	\
 		$(schema_in_files)	   	\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]