From b1352a6a2e6b16a694059794673a55f8b0647a6c Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Thu, 26 Oct 2006 17:08:08 +0000
Subject: Replaced a .sinclude with .include to catch errors when X11_TYPE is
 not one of "native" or "xorg". Failing with an error message in the right
 file is better than failing somewhere else with a completely obscure error
 message.

---
 mk/x11.buildlink3.mk | 4 ++--
 mk/x11.builtin.mk    | 4 ++--
 mk/x11.version.mk    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mk/x11.buildlink3.mk b/mk/x11.buildlink3.mk
index 175edd5da49..66b3d67d3e5 100644
--- a/mk/x11.buildlink3.mk
+++ b/mk/x11.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.4 2005/08/01 00:37:21 rillig Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.5 2006/10/26 17:08:08 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require an X11 distribution.  x11.buildlink3.mk will include the
@@ -23,4 +23,4 @@ X11_LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
 X11_LDFLAGS+=	-L${X11BASE}/lib${LIBABISUFFIX}
 .endif	# X11_BUILDLINK3_MK
 
-.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk"
+.include "${X11_PKGSRCDIR.${X11_TYPE}}/buildlink3.mk"
diff --git a/mk/x11.builtin.mk b/mk/x11.builtin.mk
index 732dab80503..22ae6398214 100644
--- a/mk/x11.builtin.mk
+++ b/mk/x11.builtin.mk
@@ -1,8 +1,8 @@
-# $NetBSD: x11.builtin.mk,v 1.1 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: x11.builtin.mk,v 1.2 2006/10/26 17:08:08 rillig Exp $
 #
 # x11.builtin.mk will include the builtin.mk file from the appropriate
 # X11 distribution.
 #
 
 .include "../../mk/x11.version.mk"
-.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
+.include "${X11_PKGSRCDIR.${X11_TYPE}}/builtin.mk"
diff --git a/mk/x11.version.mk b/mk/x11.version.mk
index 90fe3f2abd7..03a8e211908 100644
--- a/mk/x11.version.mk
+++ b/mk/x11.version.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.version.mk,v 1.5 2006/09/27 15:18:15 joerg Exp $
+# $NetBSD: x11.version.mk,v 1.6 2006/10/26 17:08:08 rillig Exp $
 #
 # The following variables may be set in /etc/mk.conf:
 #
@@ -30,4 +30,4 @@ X11_PKGSRCDIR.xorg=	../../x11/xorg-libs
 # Makefiles that include this file can access the version of the X11
 # distribution as ${BUILTIN_X11_VERSION.${X11_TYPE}}.
 #
-.sinclude "${X11_PKGSRCDIR.${X11_TYPE}}/version.mk"
+.include "${X11_PKGSRCDIR.${X11_TYPE}}/version.mk"
-- 
cgit v1.2.3