aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
Diffstat (limited to 'editors')
-rw-r--r--editors/vim/Makefile3
-rw-r--r--editors/vim6/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 18634c2bf2f2..7cb1caf377ce 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -48,13 +48,14 @@ MLINKS= vim.1 rvim.1 vim.1 rview.1
.if !defined(LITE)
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"
+MAKE_ARGS+= 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" ${I18N}
#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
+USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
.else
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
index 18634c2bf2f2..7cb1caf377ce 100644
--- a/editors/vim6/Makefile
+++ b/editors/vim6/Makefile
@@ -48,13 +48,14 @@ MLINKS= vim.1 rvim.1 vim.1 rview.1
.if !defined(LITE)
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"
+MAKE_ARGS+= 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" ${I18N}
#MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=yes" ${I18N}
.elif defined(WITH_GTK)
+USE_GTK= yes
MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt"
.else