summaryrefslogtreecommitdiff
path: root/editors/vim/Makefile
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2001-02-15 12:18:48 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2001-02-15 12:18:48 +0000
commit7b8505c2499af9e97d798e97ed7857b9b2cb9ff7 (patch)
tree5103ea164bb7999b240bf9d8eea4c97c3f5eadde /editors/vim/Makefile
parentI shouldn't have been removing `gvim' from the non-GUI PLIST. (diff)
Remove multiple `multibyte' specifications. Also sync the vim6 up
with how this is done in the vim5 port. Submitted by: clive
Notes
Notes: svn path=/head/; revision=38369
Diffstat (limited to 'editors/vim/Makefile')
-rw-r--r--editors/vim/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 3483f05c4ce5..f3949e538d6a 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -49,17 +49,18 @@ MLINKS= vim.1 rvim.1 vim.1 rview.1
MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1
MAKE_ARGS+= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features"
+I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
.if defined(WITH_ATHENA)
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena --enable-multibyte --enable-fontset --enable-multibyte --enable-xim"
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N}
#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --enable-multibyte --enable-fontset --enable-xim"
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
MAKE_ARGS+= CONF_OPT_PERL="--enable-pythoninterp"
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
.else
USE_MOTIF= yes
-MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\" --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" MOTIFHOME=${X11BASE}
+MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
.endif
.if defined(PACKAGE_BUILDING)