From: mirko Date: Sat, 4 Dec 2010 22:04:34 +0000 (+0000) Subject: [packages/jpeg] adjust Makefile to not workaround weird libtool issues anymore X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=2ebb6c73c49c80b336dcd0d9c001758cc855783d;p=packages.git [packages/jpeg] adjust Makefile to not workaround weird libtool issues anymore git-svn-id: svn://svn.openwrt.org/openwrt/packages@24256 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile index a1522c003..ab940ca61 100644 --- a/libs/jpeg/Makefile +++ b/libs/jpeg/Makefile @@ -52,20 +52,9 @@ HOST_CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ -define Build/Prepare - $(call Build/Prepare/Default) - # replace the old upstream libtool stuff with our own - ln -sf $(STAGING_DIR)/host/bin/libtool $(PKG_BUILD_DIR)/ - ln -sf $(STAGING_DIR)/host/share/libtool/config.sub $(PKG_BUILD_DIR)/ - ln -sf $(STAGING_DIR)/host/share/libtool/config.guess $(PKG_BUILD_DIR)/ - ln -sf $(STAGING_DIR)/host/share/libtool/ltmain.sh $(PKG_BUILD_DIR)/ - ln -sf /bin/true $(PKG_BUILD_DIR)/ltconfig -endef - define Build/Compile $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1} $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - LIBTOOL="./libtool --tag=CC" \ prefix="$(PKG_INSTALL_DIR)/usr" \ exec_prefix="$(PKG_INSTALL_DIR)/usr" \ all install install-headers install-lib