Bug 29489

Summary: usr.bin/vi/Makefile has superfluous conditionals
Product: Base System Reporter: Joseph Mallett <jmallett>
Component: binAssignee: freebsd-bugs (Nobody) <bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 4.3-STABLE   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Joseph Mallett 2001-08-06 21:00:07 UTC
rather than test for definition and test for lack of definition, using an else conditional (as is shown in the fix)

Fix: -.if defined(TKNVI)
+.else
+
 .PATH:         ${SRCDIR}/tk
 LDADD+=                -L/usr/local/lib -L/usr/X11R6/lib -ltk41 -lX11
 CFLAGS+=       -I/usr/local/include -I/usr/X11R6/include
Dalek# cd ../..
pwDalek# pwd
/usr/src
Dalek# diff -u usr.bin/vi/Makefile.orig usr.bin/vi/Makefile


-.if defined(TKNVI)
+.else
+
 .PATH:         ${SRCDIR}/tk
 LDADD+=                -L/usr/local/lib -L/usr/X11R6/lib -ltk41 -lX11
 CFLAGS+=       -I/usr/local/include -I/usr/X11R6/include--OgvKKe9YoC4F0miglCV4S1oHyGSd54DdDyD7eBfwomViuc9B
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- Makefile.orig       Mon Aug  6 15:50:49 2001
+++ Makefile    Mon Aug  6 15:51:25 2001
@@ -66,9 +66,9 @@
 .if !defined(TKNVI)
 DPADD+=                ${LIBNCURSES}
 LDADD+=                -lncurses
-.endif
How-To-Repeat: look at the Makefile ?
Comment 1 dd freebsd_committer freebsd_triage 2001-08-09 08:03:14 UTC
State Changed
From-To: open->closed

applied, thanks.  I think the synopsis is a little misleading; nothing was 
superfluous, it just could've been written better.  I.e., this was a 
style fix.