From 3e4b869a322118441f57f118cf4161a63ad36cc4 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Mon, 14 Sep 1998 19:36:37 +0000
Subject: ELF conversions as per Satoshi's instructions.

---
 graphics/jpeg/Makefile  | 4 ++--
 graphics/jpeg/pkg-plist | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'graphics/jpeg')

diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index f6ba48555f8c..ab6a306f8d8d 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 November 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.14 1997/07/17 15:12:43 max Exp $
+# $Id: Makefile,v 1.15 1998/04/15 21:32:49 jseger Exp $
 #
 
 DISTNAME=       jpegsrc.v6b
@@ -19,6 +19,6 @@ CONFIGURE_ARGS=	--enable-shared --enable-static
 MAN1=		cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
 
 post-install:
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/jpeg/pkg-plist b/graphics/jpeg/pkg-plist
index a8a4362605f1..eea7385d3349 100644
--- a/graphics/jpeg/pkg-plist
+++ b/graphics/jpeg/pkg-plist
@@ -8,8 +8,9 @@ include/jerror.h
 include/jmorecfg.h
 include/jpeglib.h
 lib/libjpeg.a
+@exec ranlib %D/%F
 lib/libjpeg.la
 lib/libjpeg.so
-lib/libjpeg.so.9.0
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libjpeg.so.9
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-- 
cgit v1.2.3