oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not overwrite vi and ex links by default

Browse Source 
Revert (and document) to the old behaviour of the elvis Makefile.

Change-Id: I800dba23f5c35d4c1676974962806dd824659539
This commit is contained in:
Lionel Sambuc 2012-11-16 17:03:15 +01:00
parent 0e33224aa2
commit ad85a577a6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
commands/elvis/Makefile
View File

@ -15,7 +15,8 @@ CPPFLAGS+= -w -DCRUNCH \
-DNO_MODELINE -DNO_OPTCOLS -DNO_DIGRAPH -DNO_EXTENSIONS \ -DNO_MODELINE -DNO_OPTCOLS -DNO_DIGRAPH -DNO_EXTENSIONS \
-DNO_ERRLIST -DNO_FKEY -DNO_VISIBLE -DNO_COLOR -DNO_POPUP -DNO_ERRLIST -DNO_FKEY -DNO_VISIBLE -DNO_COLOR -DNO_POPUP
# LSC Force usage of local getline # LSC Force usage of local getline, this is required here as long as
# we do not fix elvis.
CPPFLAGS+= -D__NBSD_LIBC CPPFLAGS+= -D__NBSD_LIBC
########################################################################### ###########################################################################
@ -28,8 +29,16 @@ SRCS.elvis= blk.c cmd1.c cmd2.c ctype.c curses.c cut.c ex.c input.c \
unix.c vars.c vcmd.c vi.c unix.c vars.c vcmd.c vi.c
BINDIR= /usr/bin BINDIR= /usr/bin
# Do not overwrite vi and ex if they already exist, only install the links
# as a default fallback in their absence
.if !exists(${DESTDIR}/${BINDIR}/vi)
LINKS+= ${BINDIR}/elvis ${BINDIR}/vi LINKS+= ${BINDIR}/elvis ${BINDIR}/vi
.endif
.if !exists(${DESTDIR}/${BINDIR}/ex)
LINKS+= ${BINDIR}/elvis ${BINDIR}/ex LINKS+= ${BINDIR}/elvis ${BINDIR}/ex
.endif
MAN.elvis= MAN.elvis=
MAN.ctags= MAN.ctags=