diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-16 00:10:46 +0800 |
|---|---|---|
| committer | Fridrich Strba <fridrich.strba@bluewin.ch> | 2010-03-16 00:10:46 +0800 |
| commit | 2971ce413ce9f91ac768d53487c47056b2f5710f (patch) | |
| tree | 129fbbd66ecb14d883852dacaa753a7e5c0aaa5e | |
| parent | 58d0d111af5580051b4d9a5cbaef4d7b96fdcfa8 (diff) | |
| download | gsoc2013-evolution-2971ce413ce9f91ac768d53487c47056b2f5710f.tar.gz gsoc2013-evolution-2971ce413ce9f91ac768d53487c47056b2f5710f.tar.zst gsoc2013-evolution-2971ce413ce9f91ac768d53487c47056b2f5710f.zip | |
Make the gconf schemas installation rules consistent in all Makefiles.am
| -rw-r--r-- | calendar/gui/Makefile.am | 22 | ||||
| -rw-r--r-- | mail/Makefile.am | 23 | ||||
| -rw-r--r-- | modules/addressbook/Makefile.am | 22 | ||||
| -rw-r--r-- | plugins/bogo-junk-plugin/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/external-editor/Makefile.am | 21 | ||||
| -rw-r--r-- | plugins/face/Makefile.am | 22 |
6 files changed, 82 insertions, 49 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 71ba72acd6..167c1b082d 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -260,19 +260,21 @@ if GCONF_SCHEMAS_INSTALL if OS_WIN32 install-data-local: - 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; \ - 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; \ + 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 diff --git a/mail/Makefile.am b/mail/Makefile.am index 344913b60a..ef4dcaa340 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -234,20 +234,21 @@ if GCONF_SCHEMAS_INSTALL if OS_WIN32 install-data-local: - 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 \ + 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 \ + 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 diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 24131a48b9..3a023e1e99 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -95,19 +95,21 @@ if GCONF_SCHEMAS_INSTALL if OS_WIN32 install-data-local: - 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; \ - 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 \ + 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 diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 935fc31135..075e528119 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -29,12 +29,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) if GCONF_SCHEMAS_INSTALL +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 endif diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index c36ce82111..02591aaebc 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -56,12 +56,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) if GCONF_SCHEMAS_INSTALL +if OS_WIN32 +install-data-local: + 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 \ + 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 endif diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 29c181cbee..240dc3a8d0 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -57,19 +57,21 @@ if GCONF_SCHEMAS_INSTALL if OS_WIN32 install-data-local: - 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; \ - 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; \ + 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 |