pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Move inclusion of bsd.prefs.mk a ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/394ca1119538
branches:  trunk
changeset: 461332:394ca1119538
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Sep 14 15:29:03 2003 +0000

description:
Move inclusion of bsd.prefs.mk a little higher so that /etc/mk.conf
settings won't stomp on our CFLAGS/LDFLAGS/LIBS definitions.

diffstat:

 pkgtools/pkg_install/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r b8ca66267c20 -r 394ca1119538 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Sun Sep 14 15:18:12 2003 +0000
+++ b/pkgtools/pkg_install/Makefile     Sun Sep 14 15:29:03 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2003/09/13 04:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.84 2003/09/14 15:29:03 jlam Exp $
 
 # Notes to package maintainers:
 #
@@ -32,12 +32,12 @@
 LIBNBCOMPAT_FILESDIR=  ${.CURDIR}/../../pkgtools/libnbcompat/files
 LIBNBCOMPAT_SRCDIR=    ${WRKDIR}/libnbcompat
 
+.include "../../mk/bsd.prefs.mk"
+
 CFLAGS+=               -I${LIBNBCOMPAT_SRCDIR}
 LDFLAGS+=              -L${LIBNBCOMPAT_SRCDIR}
 LIBS+=                 -lnbcompat
 
-.include "../../mk/bsd.prefs.mk"
-
 VERSION!=              ${AWK} -F '"' '/PKGTOOLS_VERSION/ {print $$2}' \
                        ${FILESDIR}/lib/version.h
 



Home | Main Index | Thread Index | Old Index