From 3668c296f242c86bdee5fb9b2f4ab5e14e37a61a Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 4 Jan 2003 20:24:27 +0000 Subject: Unifdef has got some crack-smoking exit values: "The unifdef utility exits 0 if the output is an exact copy of the input, 1 if not, and 2 if in trouble." This causes an 'Error code 1 (ignored)' in the world output, which upsets the whereintheworld scripts that the tinderboxes use. However, this stuff here is a relic. We do not enable HAVE_TCL_INTERP nor HAVE_PERL_INTERP.. The Makefile hooks to turn them on have gone ages ago, and this stuff was here for release building purposes only. Rather than fight with the tinderbox builds, clean house a bit and remove the last remaining unused relics of this stuff. --- usr.bin/vi/Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 170e89d..9ac57a4 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -61,7 +61,7 @@ SRCS+= ex.c ex_abbrev.c ex_append.c ex_args.c ex_argv.c ex_at.c ex_bang.c \ ex_read.c ex_screen.c ex_script.c ex_set.c ex_shell.c \ ex_shift.c ex_source.c ex_stop.c ex_subst.c ex_tag.c \ ex_txt.c ex_undo.c ex_usage.c ex_util.c ex_version.c ex_visual.c \ - ex_write.c ex_yank.c ex_z.c ex_notcl.c ex_noperl.c + ex_write.c ex_yank.c ex_z.c ex_tcl.c ex_perl.c # Vi source. SRCS+= getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \ @@ -73,15 +73,6 @@ SRCS+= getc.c v_at.c v_ch.c v_cmd.c v_delete.c v_ex.c v_increment.c v_init.c \ # Vi screen source. SRCS+= vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c -# unifdef has some *weird* exit codes, sigh! RTFM unifdef(1)... -ex_notcl.c: ex_tcl.c - -unifdef -UHAVE_TCL_INTERP ${SRCDIR}/ex/ex_tcl.c > ${.TARGET} - -ex_noperl.c: ex_perl.c - -unifdef -UHAVE_PERL_INTERP ${SRCDIR}/ex/ex_perl.c > ${.TARGET} - -CLEANFILES+= ex_notcl.c ex_noperl.c - afterinstall: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${CATALOGS:S;^;${SRCDIR}/catalog/;} \ -- cgit v1.1