diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1998-10-06 20:52:47 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1998-10-06 20:52:47 +0000 |
| commit | 253379a643eade07fcd91de97a1bddf39562c417 (patch) | |
| tree | 56d9695fd3d16785d5346e440ef91b06a62d773e | |
| parent | db5041299a8a22f2b84222c46c8e7e2f72d290eb (diff) | |
| download | ports-253379a643eade07fcd91de97a1bddf39562c417.tar.gz ports-253379a643eade07fcd91de97a1bddf39562c417.zip | |
Make this work in the ELF world.
Notes
Notes:
svn path=/head/; revision=13694
| -rw-r--r-- | japanese/gd/Makefile | 12 | ||||
| -rw-r--r-- | japanese/gd/pkg-plist | 5 | ||||
| -rw-r--r-- | japanese/gd1/Makefile | 12 | ||||
| -rw-r--r-- | japanese/gd1/pkg-plist | 5 |
4 files changed, 20 insertions, 14 deletions
diff --git a/japanese/gd/Makefile b/japanese/gd/Makefile index cb8fb2e2d09b..8aad370fd781 100644 --- a/japanese/gd/Makefile +++ b/japanese/gd/Makefile @@ -3,7 +3,7 @@ # Date created: 19 Aug 1998 # Whom: ichiro@ichiro.org # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/09/10 14:17:47 kuriyama Exp $ # DISTNAME= gd1.3 @@ -31,8 +31,12 @@ do-install: ${INSTALL} -c -o bin -g bin -m 555 ${WRKSRC}/$$i \ ${PREFIX}/lib; \ done - (cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so.1; \ - ${LN} -sf libgd.so.1 libgd.so) + if [ "${PORTOBJFORMAT}" = "aout" ]; then \ + (cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so); \ + else \ + (cd ${PREFIX}/lib; ${MV} -sf libgd.so.1.3 libgd.so.1; \ + ${LN} -sf libgd.so.1 libgd.so); \ + fi for i in gddemo giftogd webgif; do \ ${INSTALL} -c -o bin -g bin -m 755 ${WRKSRC}/$$i \ ${PREFIX}/bin; \ @@ -47,6 +51,6 @@ do-install: done post-install: - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/japanese/gd/pkg-plist b/japanese/gd/pkg-plist index 690bfaf2cead..27882d528c38 100644 --- a/japanese/gd/pkg-plist +++ b/japanese/gd/pkg-plist @@ -9,11 +9,10 @@ include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a lib/libgd.so -lib/libgd.so.1 lib/libgd.so.1.3 share/examples/gd/demoin.gif share/examples/gd/index.html @dirrm include/gd @dirrm share/examples/gd -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R diff --git a/japanese/gd1/Makefile b/japanese/gd1/Makefile index cb8fb2e2d09b..8aad370fd781 100644 --- a/japanese/gd1/Makefile +++ b/japanese/gd1/Makefile @@ -3,7 +3,7 @@ # Date created: 19 Aug 1998 # Whom: ichiro@ichiro.org # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/09/10 14:17:47 kuriyama Exp $ # DISTNAME= gd1.3 @@ -31,8 +31,12 @@ do-install: ${INSTALL} -c -o bin -g bin -m 555 ${WRKSRC}/$$i \ ${PREFIX}/lib; \ done - (cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so.1; \ - ${LN} -sf libgd.so.1 libgd.so) + if [ "${PORTOBJFORMAT}" = "aout" ]; then \ + (cd ${PREFIX}/lib; ${LN} -sf libgd.so.1.3 libgd.so); \ + else \ + (cd ${PREFIX}/lib; ${MV} -sf libgd.so.1.3 libgd.so.1; \ + ${LN} -sf libgd.so.1 libgd.so); \ + fi for i in gddemo giftogd webgif; do \ ${INSTALL} -c -o bin -g bin -m 755 ${WRKSRC}/$$i \ ${PREFIX}/bin; \ @@ -47,6 +51,6 @@ do-install: done post-install: - ${LDCONFIG} -m ${PREFIX}/lib + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/japanese/gd1/pkg-plist b/japanese/gd1/pkg-plist index 690bfaf2cead..27882d528c38 100644 --- a/japanese/gd1/pkg-plist +++ b/japanese/gd1/pkg-plist @@ -9,11 +9,10 @@ include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a lib/libgd.so -lib/libgd.so.1 lib/libgd.so.1.3 share/examples/gd/demoin.gif share/examples/gd/index.html @dirrm include/gd @dirrm share/examples/gd -@exec /sbin/ldconfig -m %D/lib -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R |