summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-04 13:14:29 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-04 13:14:29 +0000
commit7973f3f1fe9bc13154a782a2b1a584685056ca74 (patch)
tree262f23331ba6cf1dbc789ea3602174947de47943
parent9a4300f823816ac38cac68091502a12a50f30c7d (diff)
fix include path for glib in nocatsplash
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@555 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/nocatsplash/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile
index d5d6b3653..af79e6736 100644
--- a/package/nocatsplash/Makefile
+++ b/package/nocatsplash/Makefile
@@ -44,10 +44,13 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
);
touch $(PKG_BUILD_DIR)/.configured
+GLIB_CFLAGS :=-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
+
$(PKG_BUILD_DIR)/src/splashd: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
CC=$(TARGET_CC) \
- GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include" \
+ GLIB_CFLAGS="$(GLIB_CFLAGS)" \
+ AM_CFLAGS="$(TARGET_CFLAGS) $(GLIB_CFLAGS)" \
GLIB_LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
LIBS="-L$(STAGING_DIR)/usr/lib -lglib"