From: John Voltz <john.voltz@gmail.com>
Date: Thu, 6 Mar 2008 18:27:19 +0000 (-0000)
Subject: fixes for tiff makefile
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea5a59afad5e62942ea8e4232e5cafa78f2013a8;p=buildroot.git

fixes for tiff makefile
---

diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 813e9141eb..633dce7b5a 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -35,7 +35,7 @@ $(TIFF_DIR)/.configured: $(TIFF_DIR)/.unpacked
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
-		--libdir=/lib \
+		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
@@ -58,16 +58,16 @@ $(TIFF_DIR)/libtiff/.libs/libtiff.a: $(TIFF_DIR)/.configured
 	$(MAKE) -C $(TIFF_DIR)
 	touch -c $(TIFF_DIR)/libtiff/.libs/libtiff.a
 
-$(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION): $(TIFF_DIR)/libtiff/.libs/libtiff.a
+$(STAGING_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION): $(TIFF_DIR)/libtiff/.libs/libtiff.a
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(TIFF_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" $(STAGING_DIR)/lib/libtiff.la
-	touch -c $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION)
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libtiff.la
+	touch -c $(STAGING_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
 
-$(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION): $(STAGING_DIR)/lib/libtiff.so.$(TIFF_VERSION)
-	cp -dpf $(STAGING_DIR)/lib/libtiff.so* $(TARGET_DIR)/lib/
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION)
+$(TARGET_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION): $(STAGING_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
+	cp -dpf $(STAGING_DIR)/usr/lib/libtiff.so* $(TARGET_DIR)/usr/lib/
+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
 
-tiff: uclibc zlib jpeg $(TARGET_DIR)/lib/libtiff.so.$(TIFF_VERSION)
+tiff: uclibc zlib jpeg $(TARGET_DIR)/usr/lib/libtiff.so.$(TIFF_VERSION)
 
 tiff-clean:
 	-$(MAKE) -C $(TIFF_DIR) clean