pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/doc Move the inclusion of buildlink files ahead of the...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/640f0485b732
branches:  trunk
changeset: 468616:640f0485b732
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 15 14:09:25 2004 +0000

description:
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.

diffstat:

 doc/Makefile-example |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r 295c8ec81d3b -r 640f0485b732 doc/Makefile-example
--- a/doc/Makefile-example      Sun Feb 15 13:43:57 2004 +0000
+++ b/doc/Makefile-example      Sun Feb 15 14:09:25 2004 +0000
@@ -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 @@
 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 @@
        ${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"



Home | Main Index | Thread Index | Old Index