summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-01-11 09:37:09 +0100
committerJan Holesovsky <kendy@suse.cz>2012-01-11 09:37:09 +0100
commitee24a236e1ebcc9585ed8e24cd73512e76a0303d (patch)
treefa751c8a3f2113685a531ad7e891662266175062 /desktop
parentd506bc43f6982b33e42b3449cad059075f8faca1 (diff)
Revert "OS_FOR_BUILD is not right do decide Host module name"
This reverts commit 39cfc4d8ad77700aefabaedde430693448a5f76f. This OS_FOR_BUILD is to modify behavior in the cross-compilation case.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Executable_soffice.bin.mk2
-rw-r--r--desktop/Executable_unopkg.bin.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 8815432d1457..456171d774b6 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),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
sofficebin := soffice_bin
else
sofficebin := soffice.bin
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index c635c2b22995..464824fa2f75 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),WNT)
+ifeq ($(OS_FOR_BUILD),WNT)
unopkgbin := unopkg_bin
else
unopkgbin := unopkg.bin