88 lines
4.8 KiB
Plaintext
88 lines
4.8 KiB
Plaintext
$NetBSD: patch-Makefile,v 1.2 2013/01/15 00:06:23 morr Exp $
|
|
|
|
--- src/Makefile.orig 2012-11-22 15:18:52.000000000 +0100
|
|
+++ src/Makefile 2013-01-14 23:51:58.000000000 +0100
|
|
@@ -1196,22 +1196,27 @@
|
|
### Athena GUI
|
|
### Use Xaw3d to make the menus look a little bit nicer
|
|
#XAW_LIB = -lXaw3d
|
|
-XAW_LIB = -lXaw
|
|
+#XAW_LIB = -lXaw
|
|
|
|
### When using Xaw3d, uncomment/comment the following lines to also get the
|
|
### scrollbars from Xaw3d.
|
|
-#ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
|
|
-#ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
|
|
-# objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
|
|
-#ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
|
|
-# -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
|
|
-# -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
|
|
+.if defined(XAW_LIB)
|
|
+.if (${XAW_LIB} != "-lXaw")
|
|
+ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
|
|
+ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
|
|
+ objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
|
|
+ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
|
|
+ -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
|
|
+ -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
|
|
+.else
|
|
ATHENA_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
|
|
gui_at_sb.c gui_at_fs.c
|
|
ATHENA_OBJ = objects/gui.o objects/gui_athena.o objects/gui_x11.o \
|
|
objects/pty.o objects/gui_beval.o \
|
|
objects/gui_at_sb.o objects/gui_at_fs.o
|
|
ATHENA_DEFS = -DFEAT_GUI_ATHENA $(NARROW_PROTO)
|
|
+.endif # Xaw
|
|
+.endif # defined(XAW_LIB)
|
|
|
|
ATHENA_IPATH = $(GUI_INC_LOC)
|
|
ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
|
|
@@ -1917,7 +1922,7 @@
|
|
-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
|
|
@echo generating help tags
|
|
# Generate the help tags with ":helptags" to handle all languages.
|
|
- -@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
|
|
+ -@cd $(HELPSOURCE); $(MAKE) VIMEXE=../../src/$(VIMTARGET) vimtags
|
|
cd $(HELPSOURCE); \
|
|
files=`ls *.txt tags`; \
|
|
files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
|
|
@@ -2046,25 +2051,25 @@
|
|
fi
|
|
-chmod $(FILEMOD) $(DEST_TOOLS)/*
|
|
# replace the path in some tools
|
|
- perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
|
|
- awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
+ perlpath='$(TOOLS_SETENV) perl' && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
|
|
+ awkpath=$(TOOLS_AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
|
|
awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
|
|
-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`
|
|
|
|
# install the language specific files for tools, if they were unpacked
|
|
install-tool-languages:
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
|
- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
|
|
+ #-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
|
|
|
|
# install the language specific files, if they were unpacked
|
|
install-languages: languages $(DEST_LANG) $(DEST_KMAP)
|