[postgis-tickets] [SCM] PostGIS branch out-of-build-docs updated. 3.2.0-381-g598ffa3f9

git at osgeo.org git at osgeo.org
Thu Jan 27 09:14:46 PST 2022


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, out-of-build-docs has been updated
       via  598ffa3f99b7648d45e361bc91d36e9a8c70038d (commit)
      from  bb827330ed16bdf88dbe793b67beaa2b0e9de81d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 598ffa3f99b7648d45e361bc91d36e9a8c70038d
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jan 27 17:59:06 2022 +0100

    Fix `make images` in out-of-tree builds

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index aa71d19d9..2f535e01a 100644
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -2,6 +2,8 @@
 # *
 # * PostGIS - Spatial Types for PostgreSQL
 # * http://postgis.net
+# *
+# * Copyright (C) 2022 Sandro Santilli <strk at kbt.io>
 # * Copyright 2008 Kevin Neufeld
 # *
 # * This is free software; you can redistribute and/or modify it under
@@ -181,6 +183,9 @@ OBJS=styles.o generator.o
 # Build the generator
 all: generator
 
+images_dir:
+	mkdir -p ../images
+
 # generate the images
 images: $(IMAGES) $(IMAGES_RESIZED)
 
@@ -189,12 +194,12 @@ $(OBJS): %.o: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 # Command to build each of the .wkt files
-$(IMAGES): ../images/%.png: %.wkt generator styles.conf
-	@./generator $<
+$(IMAGES): ../images/%.png: %.wkt generator styles.conf | images_dir
+	@./generator $< $@
 
 # Command to resize each of the images
-$(IMAGES_RESIZED): ../images/%.png: %.wkt generator styles.conf
-	@./generator $<
+$(IMAGES_RESIZED): ../images/%.png: %.wkt generator styles.conf | images_dir
+	@./generator $< $@
 	convert $@ -resize 100x100 $@
 
 # Build the main executable

-----------------------------------------------------------------------

Summary of changes:
 doc/html/image_src/Makefile.in | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list