From 0e76e55e052ff78e9b448b2c444737923ff969a5 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 15 Feb 2004 14:09:25 +0000 Subject: Move the inclusion of buildlink files ahead of the target definitions. This makes all of the buildlink files come after any variable definitions that could affect their behaviour, and makes all of the target definitions come after all of the variables and .ifdef logic. This matches the way that many of the large, complex packages are already written. --- doc/Makefile-example | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'doc/Makefile-example') diff --git a/doc/Makefile-example b/doc/Makefile-example index 4bdb87fa6ed..eecb359b447 100644 --- a/doc/Makefile-example +++ b/doc/Makefile-example @@ -1,4 +1,4 @@ -# $NetBSD: Makefile-example,v 1.3 2004/01/21 10:48:21 agc Exp $ +# $NetBSD: Makefile-example,v 1.4 2004/02/15 14:09:25 jlam Exp $ # First paragraph - distfile and binary package data # DISTNAME PKGNAME PKGREVISION SVR4_PKGNAME CATEGORIES MASTER_SITES @@ -56,6 +56,17 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX} BUILD_DEFS+= GNU_PROGRAM_PREFIX +# buildlink[23] files should come after all variables have been set, +# sorted alphabetically. +.include "../../devel/gettext-lib/buildlink3.mk" + +# The section that handles pthreads should come after all other buildlink[23] +# files have been included. +.include "../../mk/pthread.buildlink3.mk" +.if ${PTHREAD_TYPE} == "none" +CONFIGURE_ARGS+= --disable-threads +.endif + # Makefile targets should occur after all the other definitions in the file post-install: ${CHMOD} g-s ${PREFIX}/bin/${GNU_PROGRAM_PREFIX}make @@ -66,9 +77,5 @@ post-install: ${LN} -s ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake .endif -# buildlink2 and buildlink3 files should come at the end of the file, -# sorted alphabetically -.include "../../devel/gettext-lib/buildlink3.mk" - # Finally, please include bsd.pkg.mk .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3