oasis

commit: 43ac3f946b81e76ceffca7d461361a29e273554b
parent aef5e5c4da0fdec1a8a88dc916b69ecfb6e85427
Author: Michael Forney <mforney@mforney.org>
Date:   Sat, 29 Jun 2019 15:48:58 -0700

ncurses: Generate ncurses_dll.h with the same sed script as other headers

Diffstat:
M
pkg/ncurses/gen.lua
6
+-----
M
pkg/ncurses/subst.sed
1
+

2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/pkg/ncurses/gen.lua b/pkg/ncurses/gen.lua
@@ -39,10 +39,6 @@ build('mkkeys', '$outdir/init_keytry.h', {'$outdir/keys.list', '|', '$outdir/mak
 rule('mkdefs', 'sh $srcdir/include/MKncurses_def.sh $in >$out.tmp && mv $out.tmp $out')
 build('mkdefs', '$outdir/ncurses_def.h', {'$srcdir/include/ncurses_defs', '|', '$srcdir/include/MKncurses_def.sh'})
 
-build('sed', '$outdir/include/ncurses_dll.h', '$srcdir/include/ncurses_dll.h.in', {
-	expr='s,@NCURSES_WRAP_PREFIX@,_nc_,',
-})
-
 rule('mkparam', '$srcdir/include/MKparametrized.sh $in >$out.tmp && mv $out.tmp $out')
 build('mkparam', '$outdir/parametrized.h', {'$srcdir/include/Caps', '|', '$srcdir/include/MKparametrized.sh'})
 
@@ -50,7 +46,7 @@ build('sed', '$outdir/MKterm.h.awk', {'$srcdir/include/MKterm.h.awk.in', '|', '$
 	expr='-f $dir/subst.sed',
 })
 
-for _, f in ipairs{'termcap.h', 'unctrl.h'} do
+for _, f in ipairs{'ncurses_dll.h', 'termcap.h', 'unctrl.h'} do
 	build('sed', '$outdir/include/'..f, {'$srcdir/include/'..f..'.in', '|', '$dir/subst.sed'}, {
 		expr='-f $dir/subst.sed',
 	})
diff --git a/pkg/ncurses/subst.sed b/pkg/ncurses/subst.sed
@@ -34,6 +34,7 @@ s,@NCURSES_WATTR_MACROS@,1,
 s,@NCURSES_WCHAR_T@,0,
 s,@NCURSES_WCWIDTH_GRAPHICS@,1,
 s,@NCURSES_WINT_T@,0,
+s,@NCURSES_WRAP_PREFIX@,_nc_,
 s,@NCURSES_XNAMES@,1,
 s,@NEED_WCHAR_H@,1,
 s,@TERMINFO@,/share/terminfo,