X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/6fc6d689b3a754c1f3f26ea0b9d6ff048c9faa90..8b196c907d07bde07860e918e3ef94297e73956e:/package/nocatsplash/Makefile

diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile
index d5d6b3653..95e83c1f7 100644
--- a/package/nocatsplash/Makefile
+++ b/package/nocatsplash/Makefile
@@ -17,11 +17,12 @@ PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 $(DL_DIR)/$(PKG_SOURCE):
 	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
+$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
 	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(PKG_BUILD_DIR)/.unpacked
+	$(PATCH) $(PKG_BUILD_DIR) ./patches
+	touch $(PKG_BUILD_DIR)/.patched
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -44,16 +45,25 @@ $(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"
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/src/splashd
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_IPK_DIR) install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		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" \
+		DESTDIR=$(PKG_IPK_DIR) install
 	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/splashd
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
@@ -62,7 +72,7 @@ $(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
 	$(IPKG) install $(PKG_IPK)
 
 source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
+prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(PKG_IPK)
 install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list