[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk Repository.mk

[Jan Holesovsky]

 Repository.mk                     |   11 ++++-------
 desktop/Executable_soffice.bin.mk |    2 +-
 desktop/Executable_unopkg.bin.mk  |    2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 42bd571e07378c5e74f279e373c1442b4d224590
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Jan 10 22:28:24 2012 -0600

    OS_FOR_BUILD is not right do decide Host module name

diff --git a/Repository.mk b/Repository.mk
index 3cc7a38..f76ae79 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Helper_register_executables,OOO,\
+	crashrep_com \
 	guiloader \
 	guistdio \
 	odbcconfig \
@@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 	sdraw \
 	simpress \
 	soffice \
+	soffice_bin \
 	smath \
 	sweb \
 	swriter \
 	unoinfo \
 	unopkg \
+	unopkg_bin \
+	unopkg_com \
 	unopkgio \
 ))
 
 else
 
-ifeq ($(OS_FOR_BUILD),WNT)
-$(eval $(call gb_Helper_register_executables,OOO,\
-	soffice_bin \
-    unopkg_bin \
-))
-else
 $(eval $(call gb_Helper_register_executables,OOO,\
     soffice.bin \
     unopkg.bin \
 ))
-endif
 
 ifeq ($(OS),MACOSX)
 
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 456171d..8815432 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
+ifeq ($(OS),WNT)
 sofficebin := soffice_bin
 else
 sofficebin := soffice.bin
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 464824f..c635c2b 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-ifeq ($(OS_FOR_BUILD),WNT)
+ifeq ($(OS),WNT)
 unopkgbin := unopkg_bin
 else
 unopkgbin := unopkg.bin