libcdr, libmspub: revert more ISYSTEM

Change-Id: I6acc0d6424cb3ed0ca2fcba12bb7c63dee13cb0d

libcdr, libmspub: revert more ISYSTEM
Change-Id: I6acc0d6424cb3ed0ca2fcba12bb7c63dee13cb0d
829851c2 · Michael Stahl · 70fcfeed · 829851c2 · 829851c2
Kaydet (Commit) 829851c2 authored Nis 01, 2013 tarafından Michael Stahl
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

ExternalProject_libcdr.mk libcdr/ExternalProject_libcdr.mk +2 -2

ExternalProject_libmspub.mk libmspub/ExternalProject_libmspub.mk +3 -2

No files found.
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -30,8 +30,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 		export PKG_CONFIG="" \
 		&& export ICU_LIBS=" " \
 		&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-		$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
+			-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-		$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
+			-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
 		&& ./configure \
 			--with-pic \
 			--enable-static \

--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -28,8 +28,9 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
 		&& export ICU_LIBS=" " \
-		&& export ICU_CFLAGS="$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
+		&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-	$(ISYSTEM)$(call gb_UnpackedTarball_get_dir,icu)/source/common" \
+			-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
+			-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
 		&& export LIBMSPUB_CFLAGS="$(WPG_CFLAGS) $(WPD_CFLAGS)" \
 		&& export LIBMSPUB_LIBS="$(WPG_LIBS) $(WPD_LIBS)" \
 		&& ./configure \