diff options
author | Andrew Shadura <andrewsh@debian.org> | 2015-11-12 19:24:53 +0100 |
---|---|---|
committer | Andrew Shadura <andrewsh@debian.org> | 2015-11-12 19:24:53 +0100 |
commit | 0cecf311178144d4fae773c2b3bf23b0767486a9 (patch) | |
tree | ba0180d13f5a82af48fc915ae57ad16e4952ff80 | |
parent | b18e0171dd55b61131734f2f68f33dfc4e9c35db (diff) |
Imported Upstream version 0.29.1
-rw-r--r-- | Makefile.inc | 2 | ||||
-rw-r--r-- | doc/NEWS | 6 | ||||
-rw-r--r-- | features/Makefile | 4 | ||||
-rw-r--r-- | features/_mkcfake.c | 3 | ||||
-rw-r--r-- | mk/mkc_imp.preinit.mk | 2 | ||||
-rw-r--r-- | presentation/presentation.pdf | bin | 161123 -> 161123 bytes | |||
-rw-r--r-- | tests/reqd/expect.out | 2 | ||||
-rw-r--r-- | tests/reqd2/expect.out | 2 | ||||
-rw-r--r-- | tests/reqd3/expect.out | 2 | ||||
-rw-r--r-- | tests/reqd4/expect.out | 2 |
10 files changed, 16 insertions, 9 deletions
diff --git a/Makefile.inc b/Makefile.inc index dc1e155..5215123 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,4 +1,4 @@ -VERSION = 0.29.0 +VERSION = 0.29.1 BIRTHDATE = 2009-02-21 @@ -1,4 +1,10 @@ ====================================================================== +Version 0.29.1, by Aleksey Cheusov, Wed, 11 Nov 2015 00:35:49 +0300 + + FIX: features "progname", "warn", "err" and "fgetln" as well as + _mkcfake.c file were added to the list of installed ones. + +====================================================================== Version 0.29.0, by Aleksey Cheusov, Sun, 30 Nov 2014 15:35:42 +0300 mkc.configure.mk: diff --git a/features/Makefile b/features/Makefile index 662178b..ee00000 100644 --- a/features/Makefile +++ b/features/Makefile @@ -1,4 +1,4 @@ -.for f in strlcat strlcpy getline +.for f in strlcat strlcpy getline progname warn err fgetln FILES += mkc_${f}.h mkc_imp.f_${f}.mk ${f}/${f}.c FILESDIR_mkc_imp.f_${f}.mk = ${MKFILESDIR} FILESDIR_mkc_${f}.h = ${FEATURESDIR} @@ -11,7 +11,7 @@ FILESDIR_mkc_imp.f_${f}.mk = ${MKFILESDIR} FILESDIR_mkc_${f}.h = ${FEATURESDIR} .endfor -.for f in netbsd_sys_queue.h netbsd_sys_tree.h +.for f in netbsd_sys_queue.h netbsd_sys_tree.h _mkcfake.c FILES += ${f} FILESDIR_${f} = ${FEATURESDIR} .endfor diff --git a/features/_mkcfake.c b/features/_mkcfake.c index 1afa530..4a28bca 100644 --- a/features/_mkcfake.c +++ b/features/_mkcfake.c @@ -1,3 +1,4 @@ -static void _mkcfake(void) +void _mkcfake(void); +void _mkcfake(void) { } diff --git a/mk/mkc_imp.preinit.mk b/mk/mkc_imp.preinit.mk index e967118..88be179 100644 --- a/mk/mkc_imp.preinit.mk +++ b/mk/mkc_imp.preinit.mk @@ -10,7 +10,7 @@ BMAKE_REQD ?= 20110606 .ifdef MAKE_VERSION -_bmake_ok != test ${MAKE_VERSION} -ge ${BMAKE_REQD} && echo 1 || echo 0 +_bmake_ok != test ${MAKE_VERSION:Q} -ge ${BMAKE_REQD:Q} && echo 1 || echo 0 .else _bmake_ok = 0 .endif diff --git a/presentation/presentation.pdf b/presentation/presentation.pdf Binary files differindex 7cf9c12..1e338dd 100644 --- a/presentation/presentation.pdf +++ b/presentation/presentation.pdf diff --git a/tests/reqd/expect.out b/tests/reqd/expect.out index 5152a37..f0dcc5b 100644 --- a/tests/reqd/expect.out +++ b/tests/reqd/expect.out @@ -1 +1 @@ -ERROR: We need mk-configure v.999.0.0 while 0.29.0 is detected +ERROR: We need mk-configure v.999.0.0 while 0.29.1 is detected diff --git a/tests/reqd2/expect.out b/tests/reqd2/expect.out index 5152a37..f0dcc5b 100644 --- a/tests/reqd2/expect.out +++ b/tests/reqd2/expect.out @@ -1 +1 @@ -ERROR: We need mk-configure v.999.0.0 while 0.29.0 is detected +ERROR: We need mk-configure v.999.0.0 while 0.29.1 is detected diff --git a/tests/reqd3/expect.out b/tests/reqd3/expect.out index 5152a37..f0dcc5b 100644 --- a/tests/reqd3/expect.out +++ b/tests/reqd3/expect.out @@ -1 +1 @@ -ERROR: We need mk-configure v.999.0.0 while 0.29.0 is detected +ERROR: We need mk-configure v.999.0.0 while 0.29.1 is detected diff --git a/tests/reqd4/expect.out b/tests/reqd4/expect.out index b1b8825..5dfb730 100644 --- a/tests/reqd4/expect.out +++ b/tests/reqd4/expect.out @@ -1,4 +1,4 @@ -ERROR: We need mk-configure v.999.0.0 while 0.29.0 is detected +ERROR: We need mk-configure v.999.0.0 while 0.29.1 is detected "bmake-20110606 or newer is required" =========== all ============ /objdir/Makefile |