remove iconv dependancy when not absolutely required

git-svn-id: svn://svn.openwrt.org/openwrt/packages@7512 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/libiconv/Makefile

@@ -49,7 +49,6 @@ endef
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/lib/libiconv/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/lib/libiconv/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib/libiconv/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.{a,so*} $(STAGING_DIR)/usr/lib/libiconv/lib/
 endef

net/weechat/Makefile

@@ -37,7 +37,7 @@ define Build/Configure
 		--with-debug=0 \
 		--with-libgnutls-prefix=$(STAGING_DIR)/usr \
 		--without-doc-xsl-prefix \
-		--without-libiconv-prefix \
+		--with-libiconv-prefix="$(STAGING_DIR)/usr/lib/libiconv" \
 		--without-libintl-prefix \
 		--disable-aspell \
 		--enable-lua \
@@ -47,7 +47,7 @@ define Build/Configure
 		--disable-python \
 		--disable-ruby \
 		, \
-		LIBS="-llua -ldl -lm" \
+		LIBS="-llua -ldl -lm -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
 	)
 endef
 

sound/mpc/Makefile

@@ -25,7 +25,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/mpc
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libiconv
   TITLE:=Music Player Daemon Console Client
   DESCRIPTION:=\
 	MPD is a music player supporting flac, mp3 and ogg files.\\\

utils/apr-util/Makefile

@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/apr-util
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libiconv +libexpat +apr
+  DEPENDS:=+libexpat +apr
   TITLE:=Apache Portable Runtime Library Util
   URL:=http://apr.apache.org/
 endef
@@ -60,7 +60,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm 	$(STAGING_DIR)/usr/bin/apu-config \
+	-rm 	$(STAGING_DIR)/usr/bin/apu-config \
 		$(STAGING_DIR)/usr/include/apr-0/{apr_anylock.h,apr_base64.h,apr_buckets.h,apr_date.h,apr_dbm.h,apr_hooks.h,apr_ldap.h,apr_ldap_url.h,apr_md4.h,apr_md5.h,apr_optional.h,apr_optional_hooks.h,apr_queue.h,apr_reslist.h,apr_rmm.h,apr_sdbm.h,apr_sha1.h,apr_strmatch.h,apr_uri.h,apr_uuid.h,apr_xlate.h,apr_xml.h,apu_compat.h,apu.h,apu_version.h,apu_want.h} \
 		$(STAGING_DIR)/usr/lib/*aprutil*
 endef