icc/source/create_sRGB_profile/makefile.mk | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d24778870ab356828c3cf6d884b6630433549e34
Author: Jan Holesovsky <ke...@suse.cz>
Date: Thu Nov 24 10:55:12 2011 +0100
Fix icc cross-compilation.
diff --git a/icc/source/create_sRGB_profile/makefile.mk
b/icc/source/create_sRGB_profile/makefile.mk
index 56a9a67..8aab067 100644
--- a/icc/source/create_sRGB_profile/makefile.mk
+++ b/icc/source/create_sRGB_profile/makefile.mk
@@ -47,8 +47,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
CFLAGS+=$(SAMPLEICC_CFLAGS)
.ELSE
CFLAGS+= \
- -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \
-
-I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils
+ -I$(PRJ)$(INPATH)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \
+ -I$(PRJ)$(INPATH)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils
.ENDIF
# --- Files --------------------------------------------------------
@@ -82,4 +82,8 @@ APP1OBJS= $(OBJFILES)
ALLTAR: $(TARGET)$(EXECPOST)
$(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST)
+.IF "$(CROSS_COMPILING)" != "YES"
cd $(BIN)$/ && $(BIN)$/$(TARGET)$(EXECPOST)
+.ELSE
+ cd $(BIN)$/ && $(SRC_ROOT)$/icc$/$(INPATH_FOR_BUILD)$/bin$/$(TARGET)
+.ENDIF
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
