diff options
| author | agc <agc@pkgsrc.org> | 2001-02-09 17:48:39 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-02-09 17:48:39 +0000 |
| commit | ac6a7d3a2bcf418685b77e31da8779d2b81eaf31 (patch) | |
| tree | e4153f5656467c1cd1e388641b967a9567b7945d /lang/jdk | |
| parent | 318b41ac3338a4e294d43cac7be6b94284de5d12 (diff) | |
| download | pkgsrc-ac6a7d3a2bcf418685b77e31da8779d2b81eaf31.tar.gz | |
+ Create the symlinks relative to the cwd, so that we don't get erroneous
pathnames in there.
+ Treat libXm separately from the rest of the libs, since (a) it needs a
separate "intermediate" symlink as well, even for ELF libs, and (b) it
uses a completely different version number from the rest of the libs,
for obvious reasons
Diffstat (limited to 'lang/jdk')
| -rw-r--r-- | lang/jdk/Makefile | 11 | ||||
| -rw-r--r-- | lang/jdk/pkg/PLIST-elf | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile index ba9c7324eda..29691b782a9 100644 --- a/lang/jdk/Makefile +++ b/lang/jdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/02/09 17:02:46 agc Exp $ +# $NetBSD: Makefile,v 1.23 2001/02/09 17:48:39 agc Exp $ # VERSION= 1.1.8 @@ -49,15 +49,18 @@ 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 \ + @(cd ${WRKSRC}/lib/i386/green_threads; \ + ${LN} -s libXm.so libXm.so.2; \ + for X in lib*.so ;do \ + if [ "$X" = "libXm.so" ]; then continue; fi; \ if [ -f $$X.* ] ;then \ ${MV} $$X $$X.* ; \ ${LN} -s $$X.* $$X; \ elif [ -f "$$X" ] ;then \ ${MV} $$X $$X.${VERSION} ; \ - ${LN} -s $$X.${VERSION} $$X; \ + ${LN} -s $$X.${VERSION} $$X; \ fi ; \ - done + done) .endif do-install: diff --git a/lang/jdk/pkg/PLIST-elf b/lang/jdk/pkg/PLIST-elf index c57c946ce11..1fd512a451e 100644 --- a/lang/jdk/pkg/PLIST-elf +++ b/lang/jdk/pkg/PLIST-elf @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST-elf,v 1.2 2001/02/09 17:02:47 agc Exp $ +@comment $NetBSD: PLIST-elf,v 1.3 2001/02/09 17:48:39 agc Exp $ lib/i386/green_threads/libXm.so +lib/i386/green_threads/libXm.so.2 lib/i386/green_threads/libXm.so.2.0 lib/i386/green_threads/libagent.so lib/i386/green_threads/libagent.so.1.1.8 |