diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-30 19:54:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-30 19:54:38 +0200 |
| commit | 2c5c1638a9fe2ef34f2fd09ed69e10ef2e821f0a (patch) | |
| tree | f72dc4ec3017046cf99213a5fd23d08a5bd6855c /src | |
| parent | 88e6cc253903c86d06abb59b35c85e6aef0152f3 (diff) | |
| download | vim-git-2c5c1638a9fe2ef34f2fd09ed69e10ef2e821f0a.tar.gz | |
patch 8.2.0667: cannot install Haiku version from sourcev8.2.0667
Problem: Cannot install Haiku version from source.
Solution: Update Makefile and rdef file. (Emir Sari, closes #6013)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 12 | ||||
| -rw-r--r-- | src/os_haiku.rdef.in (renamed from src/os_haiku.rdef) | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 1f7095d0d..12ec23cb2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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 diff --git a/src/os_haiku.rdef b/src/os_haiku.rdef.in index bf55aa9a9..64ba9f4a1 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 7a563d145..c57ef8715 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 667, +/**/ 666, /**/ 665, |