From 2a1d304a9a4544b5ef90a2b74f8c988a3474e61c Mon Sep 17 00:00:00 2001 From: rillig Date: Thu, 31 Jan 2008 13:08:12 +0000 Subject: Fixed pkglint warnings. --- x11/Xaw-Xpm/buildlink3.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'x11/Xaw-Xpm') diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk index 1e61f3cc301..cb3ba2256eb 100644 --- a/x11/Xaw-Xpm/buildlink3.mk +++ b/x11/Xaw-Xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2007/12/24 18:57:49 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2008/01/31 13:08:12 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XAW_XPM_BUILDLINK3_MK:= ${XAW_XPM_BUILDLINK3_MK}+ @@ -18,18 +18,14 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?= ../../x11/Xaw-Xpm .include "../../mk/bsd.fast.prefs.mk" -.if ${X11_TYPE} == "modular" -.PHONY: buildlink-Xaw_Xpm-inc-hack -buildlink-Xaw-Xpm-cookie: buildlink-Xaw-Xpm-inc-hack +. if ${X11_TYPE} == "modular" +buildlink-Xaw-Xpm-cookie: .PHONY buildlink-Xaw-Xpm-inc-hack -buildlink-Xaw-Xpm-inc-hack: buildlink-directories +buildlink-Xaw-Xpm-inc-hack: .PHONY buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ ${LN} -s Xaw3d ${BUILDLINK_DIR}/include/X11/Xaw -.endif -.endif # XAW_XPM_BUILDLINK3_MK - -.include "../../x11/libXpm/buildlink3.mk" +. endif LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ @@ -37,4 +33,8 @@ LIBXAW?= -L${BUILDLINK_PREFIX.Xaw-Xpm}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXpm}/lib \ -lXaw3d -lXpm +.endif # XAW_XPM_BUILDLINK3_MK + +.include "../../x11/libXpm/buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3