diff options
| -rw-r--r-- | editors/vim/Makefile | 7 | ||||
| -rw-r--r-- | editors/vim5/Makefile | 2 | ||||
| -rw-r--r-- | editors/vim6/Makefile | 7 |
3 files changed, 9 insertions, 7 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) diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile index b292cb87e7b7..e97762d8ced0 100644 --- a/editors/vim5/Makefile +++ b/editors/vim5/Makefile @@ -49,7 +49,7 @@ MLINKS+= vim.1 gvim.1 vim.1 gview.1 vim.1 rgvim.1 vim.1 rgview.1 .if !defined(LITE) MAKE_ARGS+= X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" -I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-multibyte --enable-xim" +I18N= CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim" .if defined(WITH_ATHENA) MAKE_ARGS+= CONF_OPT_GUI="--enable-gui=athena" ${I18N} diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile index 3483f05c4ce5..f3949e538d6a 100644 --- a/editors/vim6/Makefile +++ b/editors/vim6/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) |