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)
diff --git a/src/Makefile b/src/Makefile
index 1f7095d..12ec23c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2885,7 +2885,7 @@
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/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_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
diff --git a/src/os_haiku.rdef b/src/os_haiku.rdef.in
similarity index 98%
rename from src/os_haiku.rdef
rename to src/os_haiku.rdef.in
index bf55aa9..64ba9f4 100644
--- a/src/os_haiku.rdef
+++ b/src/os_haiku.rdef.in
@@ -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,
diff --git a/src/version.c b/src/version.c
index 7a563d1..c57ef87 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 667,
+/**/
666,
/**/
665,