0
0
mirror of https://github.com/vim/vim.git synced 2025-10-07 05:54:16 -04:00

patch 8.2.0667: cannot install Haiku version from source

Problem:    Cannot install Haiku version from source.
Solution:   Update Makefile and rdef file. (Emir Sari, closes #6013)
This commit is contained in:
Bram Moolenaar
2020-04-30 19:54:38 +02:00
parent 88e6cc2539
commit 2c5c1638a9
6 changed files with 32 additions and 21 deletions

View File

@@ -2885,7 +2885,7 @@ uninstall_runtime:
clean celan: testclean
-rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
-rm -rf objects
-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h
-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h auto/os_haiku.rdef
-rm -f conftest* *~ auto/link.sed
-rm -f testdir/opt_test.vim
-rm -f $(UNITTEST_TARGETS)
@@ -3042,6 +3042,14 @@ auto/if_perl.c: if_perl.xs
auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
auto/os_haiku.rdef: os_haiku.rdef.in
@echo creating $@
@echo '/* This file is automatically created by Makefile */' >> $@
@echo '/* DO NOT EDIT! Change Makefile only. */' >> $@
@cat $(srcdir)/os_haiku.rdef.in >> auto/os_haiku.rdef
sed -i "s|@MAJOR@|$(VIMMAJOR)|" auto/os_haiku.rdef
sed -i "s|@MINOR@|$(VIMMINOR)|" auto/os_haiku.rdef
auto/pathdef.c: Makefile auto/config.mk
-@echo creating $@
-@echo '/* pathdef.c */' > $@
@@ -3384,7 +3392,7 @@ objects/os_beos.o: os_beos.c
objects/os_qnx.o: os_qnx.c
$(CCC) -o $@ os_qnx.c
objects/os_haiku.rsrc: os_haiku.rdef
objects/os_haiku.rsrc: auto/os_haiku.rdef
cat $< | $(CCC) -E - | grep -v '^#' | rc -o "$@" -
objects/os_macosx.o: os_macosx.m

View File

@@ -1,12 +1,11 @@
/*
* os_haiku.rdef
* os_haiku.rdef.in: Assets and resources file for Haiku
*/
resource app_signature "application/x-vnd.Haiku-Vim-8";
resource app_version {
major = @MAJOR@,
middle = @MIDDLE@,
minor = @MINOR@,
variety = B_APPV_FINAL,

View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
667,
/**/
666,
/**/