From 3ad9c2c54ce71af3ffc53432d8d0ddcb37b91e80 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 5 Sep 2007 13:02:14 +0000
Subject: [PATCH] rename libjpeg to jpeg (match source name), cleanup

SVN-Revision: 8626
---
 libs/{libjpeg => jpeg}/Makefile               | 16 ++++++++--------
 libs/{libjpeg => jpeg}/patches/200-crop.patch |  0
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename libs/{libjpeg => jpeg}/Makefile (91%)
 rename libs/{libjpeg => jpeg}/patches/200-crop.patch (100%)

diff --git a/libs/libjpeg/Makefile b/libs/jpeg/Makefile
similarity index 91%
rename from libs/libjpeg/Makefile
rename to libs/jpeg/Makefile
index 4d5d62bcef..62fd576b73 100644
--- a/libs/libjpeg/Makefile
+++ b/libs/jpeg/Makefile
@@ -45,6 +45,10 @@ define Package/jpeg-tools
   TITLE+= manipulation tools
 endef
 
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	# replace the old upstream libtool stuff with our own
@@ -54,20 +58,17 @@ define Build/Prepare
 endef
 
 define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-	)
+	$(call Build/Configure/Default,)
 endef
 
 define Build/Compile
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
 	$(MAKE) -C $(PKG_BUILD_DIR) \
+		LIBTOOL="./libtool --tag=CC" \
 		prefix="$(PKG_INSTALL_DIR)/usr" \
 		exec_prefix="$(PKG_INSTALL_DIR)/usr" \
-		all install-headers install-lib install \
-		LIBTOOL="./libtool --tag=CC"
+		all install install-headers install-lib
 endef
 
 define Build/InstallDev
@@ -80,8 +81,7 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/jpeg{int,lib}.h \
+	rm -rf	$(STAGING_DIR)/usr/include/jpeg{int,lib}.h \
 		$(STAGING_DIR)/usr/include/j{config,error,morecfg}.h \
 		$(STAGING_DIR)/usr/lib/libjpeg.{a,so*}
 endef
diff --git a/libs/libjpeg/patches/200-crop.patch b/libs/jpeg/patches/200-crop.patch
similarity index 100%
rename from libs/libjpeg/patches/200-crop.patch
rename to libs/jpeg/patches/200-crop.patch
-- 
2.30.2