X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fcups%2FMakefile;h=4280a3fc3bdaad77c164c3ce24f30424bddc70bb;hb=ce022c47710859a697219ab87d1db655332c4d62;hp=9b84234bf7206d0180e8b1144e01225d0e850abe;hpb=7a3f3965ab388adf855f0cdd5d825b49bcff2650;p=openwrt-10.03%2F.git

diff --git a/package/cups/Makefile b/package/cups/Makefile
index 9b84234bf..4280a3fc3 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -7,7 +7,9 @@ PKG_VERSION:=1.1.23
 PKG_RELEASE:=1
 PKG_MD5SUM:=4ce09b1dce09b6b9398af0daae9adf63
 
-PKG_SOURCE_URL:=ftp://ftp3.easysw.com/pub/cups/1.1.23/
+PKG_SOURCE_URL:=http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/ftp.easysw.com/pub/cups/$(PKG_VERSION) \
+	http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/$(PKG_VERSION) \
+	ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=bzcat
@@ -85,12 +87,17 @@ $(PKG_IPK): $(PKG_IPK_DIR)/usr/sbin/cupsd
 	$(STRIP) $(PKG_IPK_DIR)/usr/lib/cups/cgi-bin/*
 	$(STRIP) $(PKG_IPK_DIR)/usr/lib/cups/daemon/*
 	cp -a ./files/* $(PKG_IPK_DIR)/
+	find $(PKG_IPK_DIR) -name CVS | xargs rm -rf
 	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 
+$(IPKG_STATE_DIR)/info/$(PKG_NAME).list:
+	$(IPKG) install $(PKG_IPK)
+
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: $(PKG_BUILD_DIR)/.patched
 compile: $(PKG_IPK)
-install:
-	$(IPKG) install $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+
 clean:
 	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)