From 8f2e3ca6949f9984a08be781f88e90e024ff157a Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 15 Aug 2000 14:29:13 +0000
Subject: USE_LIBTOOL instead of USE_PKGLIBTOOL

---
 x11/xforms/Makefile       | 4 ++--
 x11/xforms/files/Makefile | 6 +++++-
 x11/xforms/pkg/PLIST.mi   | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'x11/xforms')

diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 2c4dcae9a13..9efa6438357 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/08/01 18:03:36 tron Exp $
+# $NetBSD: Makefile,v 1.28 2000/08/15 14:29:13 wiz Exp $
 #
 
 DISTNAME=       bxform-088
@@ -41,7 +41,7 @@ DISTNAME=	bxform-088-ELF
 OBJMACHINE=	yes
 
 USE_X11BASE=	yes
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=	yes
 MAKEFILE=	${FILESDIR}/Makefile
 PLIST_SRC=	${PKGDIR}/PLIST.mi ${PKGDIR}/PLIST.shlib
 
diff --git a/x11/xforms/files/Makefile b/x11/xforms/files/Makefile
index 395ee8601a5..2f100869e42 100644
--- a/x11/xforms/files/Makefile
+++ b/x11/xforms/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1999/09/24 04:37:32 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/15 14:29:13 wiz Exp $
 #
 # Makefile using LIBTOOL to generate a shared library from the static one.
 
@@ -47,6 +47,10 @@ install-libs:	libforms.la
 		echo "ln -sf libforms.a ${LIBDIR}/libxforms.a"; \
 		ln -sf libforms.a ${LIBDIR}/libxforms.a; \
 	fi
+	@if [ -f ${LIBDIR}/libforms.la ]; then \
+		echo "ln -sf libforms.la ${LIBDIR}/libxforms.la"; \
+		ln -sf libforms.la ${LIBDIR}/libxforms.la; \
+	fi
 	@if [ -f ${LIBDIR}/libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ]; then \
 		echo "ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			${LIBDIR}/libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}"; \
diff --git a/x11/xforms/pkg/PLIST.mi b/x11/xforms/pkg/PLIST.mi
index 1f28f37ea56..46d14ddafb1 100644
--- a/x11/xforms/pkg/PLIST.mi
+++ b/x11/xforms/pkg/PLIST.mi
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST.mi,v 1.1 1999/09/23 05:29:25 jlam Exp $
+@comment $NetBSD: PLIST.mi,v 1.2 2000/08/15 14:29:14 wiz Exp $
 bin/fd2ps
 bin/fdesign
 include/X11/forms.h
 lib/libforms.a
+lib/libforms.la
 lib/libxforms.a
+lib/libxforms.la
 man/man1/fd2ps.1
 man/man1/fdesign.1
 man/man5/forms.5
-- 
cgit v1.2.3