From 5aaa40aeb1051455456fde9996f1171b3e9750bd Mon Sep 17 00:00:00 2001 From: agc Date: Fri, 9 Feb 2001 17:02:46 +0000 Subject: On ELF systems, install symlinks to shared libs as well as the libs themselves, in sync with the new PLIST style. Not tested on a.out i386 platform, as I don't have one to hand. Should address PR 12044, from Chris Jones. --- lang/jdk/Makefile | 16 +++++++++------- lang/jdk/pkg/PLIST-elf | 23 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 8 deletions(-) (limited to 'lang/jdk') diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index d5dba873267..ba9c7324eda 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/02/09 15:03:06 agc Exp $ +# $NetBSD: Makefile,v 1.22 2001/02/09 17:02:46 agc Exp $ # VERSION= 1.1.8 @@ -49,12 +49,14 @@ NO_BIN_ON_FTP= ${RESTRICTED} # This gross hack normalizes the shlib names so that automatic # shared library handling will work. pre-install: - @for X in ${WRKSRC}/lib/i386/green_threads/lib*.so ;do \ - if [ -f $$X.* ] ;then \ - ${MV} $$X $$X.* ;\ - elif [ -f "$$X" ] ;then \ - ${MV} $$X $$X.${VERSION} ;\ - fi ;\ + @for X in ${WRKSRC}/lib/i386/green_threads/lib*.so ;do \ + if [ -f $$X.* ] ;then \ + ${MV} $$X $$X.* ; \ + ${LN} -s $$X.* $$X; \ + elif [ -f "$$X" ] ;then \ + ${MV} $$X $$X.${VERSION} ; \ + ${LN} -s $$X.${VERSION} $$X; \ + fi ; \ done .endif diff --git a/lang/jdk/pkg/PLIST-elf b/lang/jdk/pkg/PLIST-elf index ce0c7fac78d..c57c946ce11 100644 --- a/lang/jdk/pkg/PLIST-elf +++ b/lang/jdk/pkg/PLIST-elf @@ -1,22 +1,43 @@ -@comment $NetBSD: PLIST-elf,v 1.1 2000/02/01 02:21:57 jwise Exp $ +@comment $NetBSD: PLIST-elf,v 1.2 2001/02/09 17:02:47 agc Exp $ +lib/i386/green_threads/libXm.so lib/i386/green_threads/libXm.so.2.0 +lib/i386/green_threads/libagent.so lib/i386/green_threads/libagent.so.1.1.8 +lib/i386/green_threads/libagent_g.so lib/i386/green_threads/libagent_g.so.1.1.8 +lib/i386/green_threads/libawt.so lib/i386/green_threads/libawt.so.1.1.8 +lib/i386/green_threads/libawt_g.so lib/i386/green_threads/libawt_g.so.1.1.8 +lib/i386/green_threads/libjava.so lib/i386/green_threads/libjava.so.1.1.8 +lib/i386/green_threads/libjava_g.so lib/i386/green_threads/libjava_g.so.1.1.8 +lib/i386/green_threads/libjpeg.so lib/i386/green_threads/libjpeg.so.1.1.8 +lib/i386/green_threads/libjpeg_g.so lib/i386/green_threads/libjpeg_g.so.1.1.8 +lib/i386/green_threads/libmath.so lib/i386/green_threads/libmath.so.1.1.8 +lib/i386/green_threads/libmath_g.so lib/i386/green_threads/libmath_g.so.1.1.8 +lib/i386/green_threads/libmmedia.so lib/i386/green_threads/libmmedia.so.1.1.8 +lib/i386/green_threads/libmmedia_g.so lib/i386/green_threads/libmmedia_g.so.1.1.8 +lib/i386/green_threads/libnet.so lib/i386/green_threads/libnet.so.1.1.8 +lib/i386/green_threads/libnet_g.so lib/i386/green_threads/libnet_g.so.1.1.8 +lib/i386/green_threads/libsysresource.so lib/i386/green_threads/libsysresource.so.1.1.8 +lib/i386/green_threads/libsysresource_g.so lib/i386/green_threads/libsysresource_g.so.1.1.8 +lib/i386/green_threads/libtawt.so lib/i386/green_threads/libtawt.so.1.1.8 +lib/i386/green_threads/libtawt_g.so lib/i386/green_threads/libtawt_g.so.1.1.8 +lib/i386/green_threads/libzip.so lib/i386/green_threads/libzip.so.1.1.8 +lib/i386/green_threads/libzip_g.so lib/i386/green_threads/libzip_g.so.1.1.8 -- cgit v1.2.3