ports/editors/vim5/files/patch-01
David E. O'Brien 257e43929f Fix building fails when compiled w/ perl interpreter option.
PR:		36124
Submitted by:	Anton Berezin <tobez@tobez.org>
2002-06-02 21:40:04 +00:00

94 lines
3.6 KiB
Text

--- Makefile.orig Sat Jun 1 18:57:12 2002
+++ Makefile Sat Jun 1 18:53:56 2002
@@ -303,6 +303,7 @@
# just an example:
#CONF_ARGS = --exec-prefix=/usr
+CONF_ARGS = --prefix=$(PREFIX)
# GUI - For creating Vim with GUI (gvim) (B)
# Uncomment this line when you don't want to get the GUI version, although you
@@ -1446,56 +1447,56 @@
installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
$(BINDIR)/$(EXTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
$(BINDIR)/$(VIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+ #cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
$(BINDIR)/$(GVIMTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET)
$(BINDIR)/$(GVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET)
$(BINDIR)/$(RVIMTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
$(BINDIR)/$(RVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
$(BINDIR)/$(RGVIMTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
$(BINDIR)/$(RGVIEWTARGET):
- cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
+ cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
# create links for the manual pages with various names to vim. This is only
# done when the links (or manpages with the same name) don't exist yet.
installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
$(MANSUBDIR)/$(EXNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+ #cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
$(MANSUBDIR)/$(VIEWNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+ #cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
$(MANSUBDIR)/$(GVIMNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
$(MANSUBDIR)/$(GVIEWNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
$(MANSUBDIR)/$(RVIMNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
$(MANSUBDIR)/$(RVIEWNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
$(MANSUBDIR)/$(RGVIMNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
$(MANSUBDIR)/$(RGVIEWNAME).1:
- cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
+ cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
uninstall: uninstall_runtime
-rm -f $(BINDIR)/$(VIMTARGET)
@@ -1640,7 +1641,9 @@
-@echo '#include "vim.h"' >> pathdef.c
-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> pathdef.c
-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' >> pathdef.c
- -@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' >> pathdef.c
+ -@echo 'char_u *all_cflags = (char_u *)' >> pathdef.c
+ -@echo '$(CC) -c -I$(srcdir) $(ALL_CFLAGS)' | \
+ sed -e 's/"/\\"/g' | sed -e 's/^/"/; s/$$/";/' >> pathdef.c
-@echo 'char_u *all_lflags = (char_u *)"$(CC) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS)";' >> pathdef.c
-@echo 'char_u *compiled_user = (char_u *)"' | tr -d \\012 >>pathdef.c
-@whoami | tr -d \\012 >>pathdef.c