summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/matchbox-fakekey/matchbox-fakekey.mk4
-rw-r--r--package/matchbox-lib/matchbox-lib.mk3
2 files changed, 4 insertions, 3 deletions
diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk
index 996206e266..e607c48c15 100644
--- a/package/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox-fakekey/matchbox-fakekey.mk
@@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
- $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
+ $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' \
+ $(@D)/Makefile
endef
MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk
index 18204d2d0b..5541867699 100644
--- a/package/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox-lib/matchbox-lib.mk
@@ -15,7 +15,8 @@ MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES
- $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \
+ $(SED) 's:-I$(STAGING_DIR)/:-I/:g' \
+ -e 's:-I/usr/include\( \|$$\)::g' \
$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
endef
OpenPOWER on IntegriCloud