diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-30 17:04:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-30 17:04:06 +0000 |
| commit | 6563c30a4c9279189e28b5d06b1f4dd5c01b6cc7 (patch) | |
| tree | bb4a3387f49841829b96e843af15a78a2ebaebd3 /pkgtools | |
| parent | 11137cda7747b9392a43fc1afa562f03d270cf45 (diff) | |
| download | pkgsrc-6563c30a4c9279189e28b5d06b1f4dd5c01b6cc7.tar.gz | |
Use "XF86_VERSION" instead of "_XF86_VERSION" as the variable name since
we use it in several places within pkgsrc as a public variable.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/builtin.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgtools/x11-links/builtin.mk b/pkgtools/x11-links/builtin.mk index 252f1ed8177..b58ec507d85 100644 --- a/pkgtools/x11-links/builtin.mk +++ b/pkgtools/x11-links/builtin.mk @@ -1,10 +1,10 @@ -# $NetBSD: builtin.mk,v 1.3 2004/03/15 17:30:18 recht Exp $ +# $NetBSD: builtin.mk,v 1.4 2004/03/30 17:04:06 jlam Exp $ .if !defined(XF86_VERSION) _X11_CONFIG_VERSION_DEF= ${X11BASE}/lib/X11/config/version.def -_XF86_VERSION= 3.3 +XF86_VERSION= 3.3 . if !exists(${_X11_CONFIG_VERSION_DEF}) -_XF86_VERSION= 0 +XF86_VERSION= 0 . else _XF86_MAJOR!= \ ${AWK} '/\#define[ ]*XF86_VERSION_MAJOR/ { print $$3 }' \ @@ -20,13 +20,12 @@ _XF86_SNAP!= \ ${_X11_CONFIG_VERSION_DEF} _XF86_TEENY= ${_XF86_PATCH}.${_XF86_SNAP} . if !empty(_XF86_TEENY:M0.0) -_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} +XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR} . else -_XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} -XF86_VERSION= ${_XF86_VERSION} +XF86_VERSION= ${_XF86_MAJOR}.${_XF86_MINOR}.${_XF86_TEENY} . endif . endif -MAKEFLAGS+= XF86_VERSION=${XF86_VERSION} +BUILDLINK_VARS+= XF86_VERSION .endif USE_BUILTIN.x11-links?= no @@ -38,4 +37,3 @@ USE_BUILTIN.x11-links?= no IGNORE_PKG.Xrandr= yes IGNORE_PKG.randrext= yes .endif - |