[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - Makefile.top scp2/InstallModule_ure.mk

[Libreoffice Gerrit user]

 Makefile.top              |    2 +-
 scp2/InstallModule_ure.mk |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit afb700e011042f73e91df163c57ebff2847ae4cd
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 6 16:06:29 2012 +0100

    [mono] install mono before finalizing filelist
    
    it was mistake created by porting mono stuff for LO-3.6
    
    Change-Id: I498f7cb7f6317dabd94798dc94db57adf304e5f1

diff --git a/Makefile.top b/Makefile.top
index ab7fed8..4dc1301 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -441,8 +441,8 @@ distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-clean-up
 	$(SRCDIR)/bin/distro-install-desktop-integration
 	$(SRCDIR)/bin/distro-install-sdk
-	$(SRCDIR)/bin/distro-install-file-lists
 	$(SRCDIR)/bin/distro-install-mono
+	$(SRCDIR)/bin/distro-install-file-lists
 
 id:
 	@create-ids
commit 41c28afa251168dad1e71f629ff30b8c30db7b1e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Nov 6 16:05:37 2012 +0100

    [mono] fix build in gbuildised scp2
    
    Change-Id: Ieee849e3e3b8bda5674027af9c6c2993b045d71a

diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk
index 99594c1..e0d7b1d 100644
--- a/scp2/InstallModule_ure.mk
+++ b/scp2/InstallModule_ure.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_InstallModule_use_packages,scp2/ure,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\
 	SYSTEM_LIBXML \
+	ENABLE_MONO \
 ))
 
 $(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\