From 732d94d25fd10fff65a378b03c3fca9bde403e95 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sun, 14 Jan 2007 03:52:21 +0000
Subject: fixup a whole steaming pile of insanity.  When packages are
 configured, they should be configured with --prefix=/usr and we then need to
 use make DESTDIR=$(STAGING_DIR) install to get things installed into the
 staging directory.  The current situation for many packages, which use
 --prefix=$(STAGING_DIR) results in the staging_dir paths getting compiled
 into the binary itself.

This also adds in a pile of libtool fixups.  Between broken pkgconfig,
broken libtool handling, and broken --prefix settings, its a wonder
things have worked as well as they have up till now.
 -Erik
---
 package/jpeg/jpeg.mk | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'package/jpeg')

diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 24cebfbd6..5ef3b4134 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -43,7 +43,18 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=$(STAGING_DIR) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libdir=/lib \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--includedir=/include \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
 		--enable-shared \
 		--enable-static \
 		--without-x \
@@ -55,7 +66,7 @@ $(JPEG_DIR)/.libs/libjpeg.a: $(JPEG_DIR)/.configured
 	touch -c $(JPEG_DIR)/.libs/libjpeg.a
 
 $(STAGING_DIR)/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a
-	$(MAKE) -C $(JPEG_DIR) install-headers install-lib
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(JPEG_DIR) install-headers install-lib
 	rm $(STAGING_DIR)/lib/libjpeg.la
 	touch -c $(STAGING_DIR)/lib/libjpeg.a
 
-- 
cgit v1.2.3