diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-01-11 09:37:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-01-11 09:37:09 +0100 |
| commit | ee24a236e1ebcc9585ed8e24cd73512e76a0303d (patch) | |
| tree | fa751c8a3f2113685a531ad7e891662266175062 | |
| parent | d506bc43f6982b33e42b3449cad059075f8faca1 (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.
| -rw-r--r-- | Repository.mk | 11 | ||||
| -rw-r--r-- | desktop/Executable_soffice.bin.mk | 2 | ||||
| -rw-r--r-- | desktop/Executable_unopkg.bin.mk | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 0724e4399398..3cc7a38f0742 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ - crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -67,23 +66,27 @@ $(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 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 |