From: Mirko Vogt <mirko@openwrt.org>
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://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=278844e5a7a94248a0eb1b43167644e60c2dd249

[packages/jpeg] adjust Makefile to not workaround weird libtool issues anymore

SVN-Revision: 24256
---

diff --git a/libs/jpeg/Makefile b/libs/jpeg/Makefile
index a1522c0032..ab940ca612 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