Changeset: 1d5bcb596a79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d5bcb596a79
Modified Files:
geom/lib/Makefile.ag
geom/monetdb5/Makefile.ag
Branch: Aug2018
Log Message:
Use correct make variables.
diffs (33 lines):
diff --git a/geom/lib/Makefile.ag b/geom/lib/Makefile.ag
--- a/geom/lib/Makefile.ag
+++ b/geom/lib/Makefile.ag
@@ -5,7 +5,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
MTSAFE
-INCLUDES = ../../common/options ../../common/stream ../../gdk $(GEOS_INCS)
$(PROJ_INCS)
+INCLUDES = ../../common/options ../../common/stream ../../gdk $(GEOS_INCS)
$(proj_CFLAGS)
lib_geom = {
NOINST
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -10,7 +10,7 @@ INCLUDES = ../lib \
../../common/stream \
../../common/options \
../../monetdb5/mal \
- $(GEOS_INCS) $(PROJ_INCS)
+ $(GEOS_INCS) $(proj_CFLAGS)
lib__geom = {
MODULE
@@ -20,7 +20,7 @@ lib__geom = {
WIN32?../../gdk/libbat \
WIN32?../../common/stream/libstream \
WIN32?../../monetdb5/tools/libmonetdb5 \
- $(GEOS_LIBS) $(PROJ_LIBS)
+ $(GEOS_LIBS) $(proj_LIBS)
}
headers_mal = {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
