adds wnck package

[openwrt/svn-archive/archive.git] / libs / libpng / Makefile

diff --git a/libs/libpng/Makefile b/libs/libpng/Makefile
index b2cbe4f0021fabe7b7dc7a13926f69fe7f254d30..40dd9de812cbc34dfd7a07f898de890315d84a71 100644 (file)
--- a/libs/libpng/Makefile
+++ b/libs/libpng/Makefile
@@ -44,8 +44,8 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/
+       mkdir -p $(2)/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(2)/bin/
        mkdir -p $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(1)/usr/include/
@@ -53,16 +53,7 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(1)/usr/lib/
        mkdir -p $(1)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/
-       $(SED) 's,^[ILR]_opts=".\+",,g' $(1)/usr/bin/libpng*-config
-endef
-
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/bin/libpng{,12}-config \
-               $(STAGING_DIR)/usr/include/png{,conf}.h \
-               $(STAGING_DIR)/usr/include/libpng \
-               $(STAGING_DIR)/usr/lib/libpng{,12}.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
+       $(SED) 's,^[ILR]_opts=".\+",,g' $(2)/bin/libpng*-config
 endef
 
 define Package/libpng/install