epm/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 683928f27cb34fcfaf071fde5c308848ab3b4786
Author: Tor Lillqvist <[email protected]>
Date:   Mon Oct 15 15:40:41 2012 +0300

    Don't do anything here if cross-compiling
    
    Change-Id: I822976be73bf3c99a2b195d275dd7f5f98bbe247

diff --git a/epm/makefile.mk b/epm/makefile.mk
index 795c0d0..ebfcb97 100644
--- a/epm/makefile.mk
+++ b/epm/makefile.mk
@@ -40,7 +40,7 @@ TARFILE_NAME=epm-3.7
 TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4
 PATCH_FILES=epm-3.7.patch
 
-.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO"
+.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" && "$(CROSS_COMPILING)" != "YES"
 
 EXTRPATH = NONE
 
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to