From 725c5adf330f7fb7939adad897cfcd4466552787 Mon Sep 17 00:00:00 2001 From: form Date: Thu, 24 Jun 1999 11:03:07 +0000 Subject: [PATCH] Installation errors fixed: - symlinks to Lesstif libraries never created in ${PREFIX}/lib if NO_SHARED_LIBS is defined; - bogus "/lib" in symlinks; - ${LDCONFIG} -m called for each library installed. --- x11/lesstif/Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 208b9b4f4ff..2efbbbebb0d 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 1999/06/23 00:09:23 marc Exp $ +# $OpenBSD: Makefile,v 1.26 1999/06/24 11:03:07 form Exp $ # $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $ DISTNAME= lesstif-0.88.1 @@ -11,6 +11,9 @@ NEED_VERSION= 1.73 MAINTAINER= brad@openbsd.org +STATIC_LIBS= libMrm.a libXm.a +SHARED_LIBS= libMrm.so.1.2 libXm.so.1.2 + USE_X11= yes SEPARATE_BUILD= concurrent GNU_CONFIGURE= yes @@ -44,11 +47,14 @@ pre-install: # ldconfig to update the library cache # post-install: -.for lib in libMrm.a libMrm.so.1.2 libXm.a libXm.so.1.2 - if [ "x${NO_SHARED_LIBS}" = "x" ]; then \ - ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/lib/${lib} ${PREFIX}/lib; \ - ${LDCONFIG} -m ${PREFIX}/lib; \ - fi +.for lib in ${STATIC_LIBS} + ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/${lib} ${PREFIX}/lib .endfor +.if !defined(NO_SHARED_LIBS) +.for lib in ${SHARED_LIBS} + ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/${lib} ${PREFIX}/lib +.endfor + ${LDCONFIG} -m ${PREFIX}/lib +.endif .include