From 96bc8048c3217bb231f2f30eadeb628134b557f5 Mon Sep 17 00:00:00 2001 From: Satoshi Asami Date: Sat, 14 Nov 1998 09:43:39 +0000 Subject: Use bsd.port.{pre,post}.mk to move PORTOBJFORMAT to front, or change shell loops to make loops. Use EXTRA_PKG_FLAGS to add install scripts instead of adding it to PKG_FLAGS after bsd.port.mk. --- x11-servers/XttXF86srv-common/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'x11-servers/XttXF86srv-common/Makefile') diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile index cec1cdf8432b..ff4a2f76c3a8 100644 --- a/x11-servers/XttXF86srv-common/Makefile +++ b/x11-servers/XttXF86srv-common/Makefile @@ -3,7 +3,7 @@ # Date created: 15 April 1998 # Whom: Taguchi Takeshi # -# $Id: Makefile,v 1.6 1998/10/15 01:18:23 jseger Exp $ +# $Id: Makefile,v 1.7 1998/10/22 00:25:53 steve Exp $ # DISTNAME= xc @@ -82,6 +82,8 @@ TMPPLIST= ${WRKDIR}/.PLIST.common.mktmp BROKEN= This port is dummy. .endif +.include + .if defined(SERVER) .if ${SERVER} != xfs pre-fetch: @@ -139,14 +141,14 @@ do-install: @( \ cd ${WRKSRC}/lib/font; \ ${SETENV} ${MAKE_ENV} ${MAKE} install; \ - if [ "${PORTOBJFORMAT}" = "aout" ]; then \ - ${LN} -sf libfont.so.1.0 ${PREFIX}/lib/libfont.so; \ - fi; \ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib; \ ${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \ ${MKDIR} ${DOCDIR}; \ ${INSTALL_DATA} ${XTTDIR}/xtt10-*.eng ${DOCDIR}; \ ${INSTALL_DATA} ${XTTDIR}/xtt10-*.jis ${DOCDIR} ) +.if ${PORTOBJFORMAT} == "aout" + ${LN} -sf libfont.so.1.0 ${PREFIX}/lib/libfont.so +.endif .elif defined(SERVER) && ${SERVER} == xfs do-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${INSTALL_PROGRAM} ${WRKSRC}/programs/xfs/xfs ${PREFIX}/bin/xfs.xtt @@ -163,4 +165,4 @@ post-install: post-package: @${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE} -.include +.include -- cgit v1.2.3