X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1bcbf401379815eaa2a10978ca901075520272f5..183c4345af15d6cf8e60ba079a1da9108294ffe2:/package/glib/Makefile

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 5b35fa1ce..cbbd48678 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -7,7 +7,10 @@ PKG_VERSION := 1.2.10
 PKG_RELEASE := 1
 PKG_MD5SUM := 6fe30dad87c77b91b632def29dd69ef9
 
-PKG_SOURCE_URL := ftp://ftp.gtk.org/pub/gtk/v1.2
+PKG_SOURCE_URL := ftp://ftp.gtk.org/pub/gtk/v1.2 \
+	http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
+	http://ftp.esat.net/mirrors/ftp.gimp.org/pub/gtk/v1.2/ \
+	http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT := zcat
 
@@ -45,6 +48,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
 		  --host=$(GNU_TARGET_NAME) \
@@ -66,15 +70,15 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --enable-shared=yes \
 		  --enable-static=yes \
 	);
-	touch $(PKG_BUILD_DIR)/.configured
+	touch $@
 
 $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-	  	$(TARGET_CONFIGURE_OPTS)
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
-	touch $(PKG_BUILD_DIR)/.built
+	touch $@
 
 $(IPKG_GLIB1):
 	install -m0755 -d $(IDIR_GLIB1)/usr/lib
@@ -107,4 +111,4 @@ uninstall-dev:
 	rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 
 compile: install-dev
-clean: uninstall-dev
\ No newline at end of file
+clean: uninstall-dev