mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "OS_FOR_BUILD is not right do decide Host module name"

Browse Source 
This reverts commit 39cfc4d8ad.

This OS_FOR_BUILD is to modify behavior in the cross-compilation case.
This commit is contained in:
Jan Holesovsky
2012-01-11 09:37:09 +01:00
parent d506bc43f6
commit ee24a236e1
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Repository.mk
View File

@@ -56,7 +56,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_executables,OOO,\ $(eval $(call gb_Helper_register_executables,OOO,\
crashrep_com \
guiloader \ guiloader \
guistdio \ guistdio \
odbcconfig \ odbcconfig \
@@ -67,23 +66,27 @@ $(eval $(call gb_Helper_register_executables,OOO,\
sdraw \ sdraw \
simpress \ simpress \
soffice \ soffice \
soffice_bin \
smath \ smath \
sweb \ sweb \
swriter \ swriter \
unoinfo \ unoinfo \
unopkg \ unopkg \
unopkg_bin \
unopkg_com \
unopkgio \ unopkgio \
)) ))
else 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,\ $(eval $(call gb_Helper_register_executables,OOO,\
soffice.bin \ soffice.bin \
unopkg.bin \ unopkg.bin \
)) ))
endif
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)

2
desktop/Executable_soffice.bin.mk
View File

@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # instead of those above.
ifeq ($(OS),WNT) ifeq ($(OS_FOR_BUILD),WNT)
sofficebin := soffice_bin sofficebin := soffice_bin
else else
sofficebin := soffice.bin sofficebin := soffice.bin

2
desktop/Executable_unopkg.bin.mk
View File

@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above. # instead of those above.
ifeq ($(OS),WNT) ifeq ($(OS_FOR_BUILD),WNT)
unopkgbin := unopkg_bin unopkgbin := unopkg_bin
else else
unopkgbin := unopkg.bin unopkgbin := unopkg.bin