diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-31 16:37:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-31 16:37:33 +0100 |
| commit | bbb3339dbfa2067fab616698739097df06aa5e6c (patch) | |
| tree | bf5a9b5db2ea64033ea9b8ccbab70e280d1053d0 | |
| parent | a542c680a8b42cb766e64d4ee7374ef4dacb7832 (diff) | |
| download | vim-git-bbb3339dbfa2067fab616698739097df06aa5e6c.tar.gz | |
patch 7.4.1224v7.4.1224
Problem: Build problems with GTK on BSD. (Mike Williams)
Solution: Don't use "$<". Skip building gui_gtk_gresources.h when it doesn't
work. (Kazunobu Kuriyama)
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index f388f9ab3..8fd59fb08 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2646,9 +2646,11 @@ GUI_GTK_RES_INPUTS = \ ../pixmaps/stock_vim_window_split_vertical.png auto/gui_gtk_gresources.c: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS) - $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< + $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS) - $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register $< + if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \ + $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \ + fi # All the object files are put in the "objects" directory. Since not all make # commands understand putting object files in another directory, it must be diff --git a/src/version.c b/src/version.c index 00d9c0b3d..9e92bd1e4 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1224, +/**/ 1223, /**/ 1222, |