pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/doc doc/Makefile-example: reorder targets



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d0ca90a48fc
branches:  trunk
changeset: 380771:9d0ca90a48fc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon May 21 18:35:22 2018 +0000

description:
doc/Makefile-example: reorder targets

buildlink3.mk file inclusions come last.

diffstat:

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

diffs (40 lines):

diff -r 2acc61ca89b8 -r 9d0ca90a48fc doc/Makefile-example
--- a/doc/Makefile-example      Mon May 21 17:49:50 2018 +0000
+++ b/doc/Makefile-example      Mon May 21 18:35:22 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-example,v 1.24 2016/01/29 23:10:18 rillig Exp $
+# $NetBSD: Makefile-example,v 1.25 2018/05/21 18:35:22 wiz Exp $
 
 # First paragraph - distfile and binary package data
 # DISTNAME PKGNAME PKGREVISION CATEGORIES MASTER_SITES
@@ -69,17 +69,6 @@
 PLIST_SUBST+=          GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 BUILD_DEFS+=           GNU_PROGRAM_PREFIX
 
-# buildlink3 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 buildlink3
-# 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
@@ -90,5 +79,12 @@
        ${LN} -s ${GNU_PROGRAM_PREFIX}make ${PREFIX}/bin/gmake
 .endif
 
+# buildlink3 files should come after all variables have been set,
+# sorted alphabetically.
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+# Files from mk/ should be after other buildlink3 files have been included.
+.include "../../mk/pthread.buildlink3.mk"
+
 # Finally, please include bsd.pkg.mk
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index