diff options
| author | Andrew Shadura <andrewsh@debian.org> | 2014-09-14 17:41:43 +0200 |
|---|---|---|
| committer | Andrew Shadura <andrew@shadura.me> | 2015-07-25 14:44:57 +0200 |
| commit | 02e4dec7376d8e7b563b8008b979682b82b23e11 (patch) | |
| tree | 18b1263e3a507d785fbde6a8a09e6e019ff986a8 /Makefile.inc | |
| parent | 99305952b2affb1672b6f44834378729c753aab4 (diff) | |
| parent | 7bea690e43ee009efc9e8f6a45504496348cd3ee (diff) | |
Imported Debian patch 0.28.0-1
Diffstat (limited to 'Makefile.inc')
| -rw-r--r-- | Makefile.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.inc b/Makefile.inc index 84c7c52..38d9be8 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,14 +1,14 @@ -VERSION = 0.27.0 +VERSION = 0.28.0 BIRTHDATE = 2009-02-21 MKFILESDIR ?= ${PREFIX}/share/mkc-mk DOCDIR ?= ${PREFIX}/share/doc/mk-configure -BUILTINSDIR ?= ${PREFIX}/share/mk-configure/custom +BUILTINSDIR ?= ${PREFIX}/share/mk-configure/builtins FEATURESDIR ?= ${PREFIX}/share/mk-configure/features INTEXTS_REPLS += version ${VERSION} -INTEXTS_REPLS += AWK ${AWK} +INTEXTS_REPLS += AWK ${PROG.awk} INTEXTS_REPLS += BMAKE ${BMAKE} INTEXTS_REPLS += mkfilesdir ${MKFILESDIR} INTEXTS_REPLS += syscustomdir ${BUILTINSDIR} @@ -17,11 +17,9 @@ INTEXTS_REPLS += mkc_libexecdir ${LIBEXECDIR} .if exists(/usr/xpg4/bin/awk) # Solaris' /usr/bin/awk is completely broken, # /usr/xpg4/bin/awk sucks too but sucks less. -AWK ?= /usr/xpg4/bin/awk -.elif exists(/usr/bin/awk) -AWK ?= /usr/bin/awk +PROG.awk ?= /usr/xpg4/bin/awk .else -AWK ?= /bin/awk +MKC_REQUIRE_PROGS += awk .endif BMAKE ?= bmake |