update to new upstream release (v0.99.154), add some mirrors, standardize Makefile

SVN-Revision: 2307

openwrt/package/ipkg/Makefile

@@ -3,11 +3,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipkg
-PKG_VERSION:=0.99.149
+PKG_VERSION:=0.99.154
 PKG_RELEASE:=1
-PKG_MD5SUM:=975cc419d6db5fb279dc58177c68373b
+PKG_MD5SUM:=b60aeea3b86cecf0eb26b161d122fbcc
 
-PKG_SOURCE_URL:=http://www.handhelds.org/packages/ipkg
+PKG_SOURCE_URL:=http://www.handhelds.org/packages/ipkg \
+	http://www.gtlib.gatech.edu/pub/handhelds.org/packages/ipkg \
+	http://ftp.gwdg.de/pub/linux/handhelds/packages/ipkg
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -22,28 +24,28 @@ $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		./configure \
-		  --target=$(GNU_TARGET_NAME) \
+			--target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
+			--build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
+			--program-prefix="" \
-		  --program-suffix="" \
+			--program-suffix="" \
-		  --prefix=/usr \
+			--prefix=/usr \
-		  --exec-prefix=/usr \
+			--exec-prefix=/usr \
-		  --bindir=/bin \
+			--bindir=/bin \
-		  --datadir=/usr/share \
+			--datadir=/usr/share \
-		  --includedir=/usr/include \
+			--includedir=/usr/include \
-		  --infodir=/usr/share/info \
+			--infodir=/usr/share/info \
-		  --libdir=/usr/lib \
+			--libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
+			--libexecdir=/usr/lib \
-		  --localstatedir=/var \
+			--localstatedir=/var \
-		  --mandir=/usr/share/man \
+			--mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
+			--sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
+			--sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
+			$(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
+			$(DISABLE_NLS) \
 	)
 	touch $@