aboutsummaryrefslogtreecommitdiffstats
path: root/package/libiconv
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2006-03-17 11:21:32 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2006-03-17 11:21:32 +0000
commita514ddd6c1716a75c2df62d865318bc2f4bae274 (patch)
tree0e605b2850e53f79554baace04fad345a368bcd5 /package/libiconv
parent8e3a83d53fb5673541dd67787d2e493c1536b706 (diff)
downloadmaster-187ad058-a514ddd6c1716a75c2df62d865318bc2f4bae274.tar.gz
master-187ad058-a514ddd6c1716a75c2df62d865318bc2f4bae274.tar.bz2
master-187ad058-a514ddd6c1716a75c2df62d865318bc2f4bae274.zip
install libiconv in an unusual place, suggested by nico, otherwise other packages will pick it up
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3392 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libiconv')
-rw-r--r--package/libiconv/Makefile24
1 files changed, 10 insertions, 14 deletions
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index 277a03de53..fbbd52f68b 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $Id4
+# $Id$
include $(TOPDIR)/rules.mk
@@ -60,28 +60,24 @@ $(PKG_BUILD_DIR)/.built:
$(IPKG_LIBICONV):
install -d -m0755 $(IDIR_LIBICONV)/usr/lib
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/
chmod 0644 $(IDIR_LIBICONV)/usr/lib/*
$(RSTRIP) $(IDIR_LIBICONV)
$(IPKG_BUILD) $(IDIR_LIBICONV) $(PACKAGE_DIR)
-$(STAGING_DIR)/usr/lib/libiconv.so: $(PKG_BUILD_DIR)/.built
- mkdir -p $(STAGING_DIR)/usr/include
- cp -fpR $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
- mkdir -p $(STAGING_DIR)/usr/lib/
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/
+$(STAGING_DIR)/usr/lib/iconv/libiconv.so: $(PKG_BUILD_DIR)/.built
+ mkdir -p $(STAGING_DIR)/usr/include/iconv
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/iconv
+ mkdir -p $(STAGING_DIR)/usr/lib/iconv
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/iconv
touch $@
-install-dev: $(STAGING_DIR)/usr/lib/libiconv.so
+install-dev: $(STAGING_DIR)/usr/lib/iconv/libiconv.so
uninstall-dev:
rm -rf \
- $(STAGING_DIR)/usr/include/iconv.h \
- $(STAGING_DIR)/usr/lib/libiconv.* \
+ $(STAGING_DIR)/usr/include/iconv \
+ $(STAGING_DIR)/usr/lib/iconv \
compile: install-dev
clean: uninstall-dev
-
-mostlyclean:
- $(MAKE) -C $(PKG_BUILD_DIR) clean
- rm -f $(PKG_BUILD_DIR)/.built