install libiconv in an unusual place, suggested by nico, otherwise other packages will pick it up
SVN-Revision: 3392
This commit is contained in:
parent
77b9b05627
commit
dbff23b6d2
1 changed files with 10 additions and 14 deletions
|
@ -1,4 +1,4 @@
|
||||||
# $Id4
|
# $Id$
|
||||||
|
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
|
@ -60,28 +60,24 @@ $(PKG_BUILD_DIR)/.built:
|
||||||
|
|
||||||
$(IPKG_LIBICONV):
|
$(IPKG_LIBICONV):
|
||||||
install -d -m0755 $(IDIR_LIBICONV)/usr/lib
|
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/*
|
chmod 0644 $(IDIR_LIBICONV)/usr/lib/*
|
||||||
$(RSTRIP) $(IDIR_LIBICONV)
|
$(RSTRIP) $(IDIR_LIBICONV)
|
||||||
$(IPKG_BUILD) $(IDIR_LIBICONV) $(PACKAGE_DIR)
|
$(IPKG_BUILD) $(IDIR_LIBICONV) $(PACKAGE_DIR)
|
||||||
|
|
||||||
$(STAGING_DIR)/usr/lib/libiconv.so: $(PKG_BUILD_DIR)/.built
|
$(STAGING_DIR)/usr/lib/iconv/libiconv.so: $(PKG_BUILD_DIR)/.built
|
||||||
mkdir -p $(STAGING_DIR)/usr/include
|
mkdir -p $(STAGING_DIR)/usr/include/iconv
|
||||||
cp -fpR $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/iconv.h $(STAGING_DIR)/usr/include/iconv
|
||||||
mkdir -p $(STAGING_DIR)/usr/lib/
|
mkdir -p $(STAGING_DIR)/usr/lib/iconv
|
||||||
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libiconv.* $(STAGING_DIR)/usr/lib/iconv
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
install-dev: $(STAGING_DIR)/usr/lib/libiconv.so
|
install-dev: $(STAGING_DIR)/usr/lib/iconv/libiconv.so
|
||||||
|
|
||||||
uninstall-dev:
|
uninstall-dev:
|
||||||
rm -rf \
|
rm -rf \
|
||||||
$(STAGING_DIR)/usr/include/iconv.h \
|
$(STAGING_DIR)/usr/include/iconv \
|
||||||
$(STAGING_DIR)/usr/lib/libiconv.* \
|
$(STAGING_DIR)/usr/lib/iconv \
|
||||||
|
|
||||||
compile: install-dev
|
compile: install-dev
|
||||||
clean: uninstall-dev
|
clean: uninstall-dev
|
||||||
|
|
||||||
mostlyclean:
|
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) clean
|
|
||||||
rm -f $(PKG_BUILD_DIR)/.built
|
|
||||||
|
|
Loading…
Reference in a new issue