X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fcups%2FMakefile;h=20ded7c6d1d03b923c13e5db98dbddd88d70cb9c;hb=c8e80f1270f160e7e411835a94ec4e69b844f30c;hp=48cf229635f7b9ca715ad5311fe622ef784f4e8b;hpb=c703dc38c441401dc7a5cb8271b1bf71e9ae60cf;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/cups/Makefile b/net/cups/Makefile
index 48cf229635..20ded7c6d1 100644
--- a/net/cups/Makefile
+++ b/net/cups/Makefile
@@ -18,7 +18,6 @@ PKG_SOURCE_URL:= \
 	ftp://ftp.easysw.com/pub/cups/$(PKG_VERSION) \
 	ftp://ftp3.easysw.com/pub/cups/$(PKG_VERSION)
 PKG_MD5SUM:=4ce09b1dce09b6b9398af0daae9adf63
-PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -32,9 +31,12 @@ define Package/cups
   CATEGORY:=Network
   DEPENDS:=+zlib
   TITLE:=Common UNIX Printing System
-  DESCRIPTION:=\
-	A printer spooling system for devices with USB or LP support.
   URL:=http://www.cups.org/
+  SUBMENU:=printing
+endef
+
+define Package/cups/description
+	A printer spooling system for devices with USB or LP support.
 endef
 
 define Package/cups/conffiles
@@ -80,7 +82,7 @@ define Package/cups/install
 	rm -rf $(1)/etc/cups/certs
 	ln -sf /tmp $(1)/etc/cups/certs
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	rm -f $(1)/usr/bin/cups-config
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(1)/usr/lib/
@@ -91,7 +93,7 @@ define Package/cups/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(1)/usr/share/doc/cups/
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(1)/usr/share/doc/cups/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
 	# overwrite default config with our own
 	$(CP) ./files/etc/cups/* $(1)/etc/cups/
 	# install initscript with priority 60
@@ -100,19 +102,12 @@ define Package/cups/install
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/bin/cups-config \
-		$(STAGING_DIR)/usr/include/cups \
-		$(STAGING_DIR)/usr/lib/libcups.{a,so*}
+	mkdir -p $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(1)/usr/bin/
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,cups))