Date: Mon, 6 Aug 2001 12:53:45 -0700 (PDT) From: Joseph Mallett <jmallett@xMach.org> To: freebsd-gnats-submit@FreeBSD.org Subject: bin/29489: usr.bin/vi/Makefile has superfluous conditionals Message-ID: <200108061953.f76Jrj182810@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 29489
>Category: bin
>Synopsis: usr.bin/vi/Makefile has superfluous conditionals
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 06 13:00:07 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Joseph Mallett
>Release: 4.3-STABLE
>Organization:
xMach.org
>Environment:
FreeBSD Dalek.xMach.ORG 4.3-STABLE FreeBSD 4.3-STABLE #0: Mon Jun 18 07:07:16 EDT 2001 jmallett@Dalek.xMach.ORG:/usr/home/jmallett/vmunix.build i386
>Description:
rather than test for definition and test for lack of definition, using an else conditional (as is shown in the fix)
>How-To-Repeat:
look at the Makefile ?
>Fix:
--- 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
-.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
--- usr.bin/vi/Makefile.orig Mon Aug 6 15:50:49 2001
+++ usr.bin/vi/Makefile Mon Aug 6 15:51:25 2001
@@ -66,9 +66,9 @@
.if !defined(TKNVI)
DPADD+= ${LIBNCURSES}
LDADD+= -lncurses
-.endif
-.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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200108061953.f76Jrj182810>