patch 7.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)
diff --git a/src/Makefile b/src/Makefile
index f388f9a..8fd59fb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2646,9 +2646,11 @@
../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 00d9c0b..9e92bd1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1224,
+/**/
1223,
/**/
1222,