diff options
| author | jmmv <jmmv@pkgsrc.org> | 2005-09-26 11:44:54 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2005-09-26 11:44:54 +0000 |
| commit | d3096c6ea8cb151777e485e91bea69da83cfa3c1 (patch) | |
| tree | 6d56dc65000a726e252000a254e8e328446ab944 /devel | |
| parent | 46087d3cf9748ee3eeabb418d95c713c0dc4ebe5 (diff) | |
| download | pkgsrc-d3096c6ea8cb151777e485e91bea69da83cfa3c1.tar.gz | |
Move CPPFLAGS definitions below inclusion of bsd.prefs.mk, as mk.conf may
do a 'CPPFLAGS=...' overriding its value. Fixes PR pkg/30029 by
Idar Tollefsen. Allowed by agc@ during freeze.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib2/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 093b7973660..e42ead6314c 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2005/08/10 20:56:15 jlam Exp $ +# $NetBSD: Makefile,v 1.80 2005/09/26 11:44:54 jmmv Exp $ DISTNAME= glib-2.6.6 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -47,12 +47,12 @@ CONFIGURE_ENV+= F77=${FALSE} CONFIGURE_ENV+= PERL_PATH=${PERL5} +.include "../../mk/bsd.prefs.mk" + CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\"" CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" -.include "../../mk/bsd.prefs.mk" - .if ${OPSYS} == "FreeBSD" SUBST_CLASSES= thr |