Changeset: 5fc6544713fb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fc6544713fb
Modified Files:
sql/backends/monet5/UDF/cudf/Makefile.ag
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/lidar/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/shp/Makefile.ag
Branch: default
Log Message:
Merge heads.
diffs (82 lines):
diff --git a/sql/backends/monet5/UDF/cudf/Makefile.ag
b/sql/backends/monet5/UDF/cudf/Makefile.ag
--- a/sql/backends/monet5/UDF/cudf/Makefile.ag
+++ b/sql/backends/monet5/UDF/cudf/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-INCLUDES = ../../ \
+INCLUDES = ../.. \
../../../../include \
../../../../common \
../../../../storage \
diff --git a/sql/backends/monet5/vaults/bam/Makefile.ag
b/sql/backends/monet5/vaults/bam/Makefile.ag
--- a/sql/backends/monet5/vaults/bam/Makefile.ag
+++ b/sql/backends/monet5/vaults/bam/Makefile.ag
@@ -4,8 +4,8 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-INCLUDES = ../ \
- ../../ \
+INCLUDES = .. \
+ ../.. \
../../../../include \
../../../../common \
../../../../storage \
diff --git a/sql/backends/monet5/vaults/fits/Makefile.ag
b/sql/backends/monet5/vaults/fits/Makefile.ag
--- a/sql/backends/monet5/vaults/fits/Makefile.ag
+++ b/sql/backends/monet5/vaults/fits/Makefile.ag
@@ -4,8 +4,8 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-INCLUDES = ../ \
- ../../ \
+INCLUDES = .. \
+ ../.. \
../../../../include \
../../../../common \
../../../../storage \
diff --git a/sql/backends/monet5/vaults/lidar/Makefile.ag
b/sql/backends/monet5/vaults/lidar/Makefile.ag
--- a/sql/backends/monet5/vaults/lidar/Makefile.ag
+++ b/sql/backends/monet5/vaults/lidar/Makefile.ag
@@ -4,8 +4,8 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-INCLUDES = ../ \
- ../../ \
+INCLUDES = .. \
+ ../.. \
../../../../include \
../../../../common \
../../../../storage \
diff --git a/sql/backends/monet5/vaults/netcdf/Makefile.ag
b/sql/backends/monet5/vaults/netcdf/Makefile.ag
--- a/sql/backends/monet5/vaults/netcdf/Makefile.ag
+++ b/sql/backends/monet5/vaults/netcdf/Makefile.ag
@@ -4,8 +4,8 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-INCLUDES = ../ \
- ../../ \
+INCLUDES = .. \
+ ../.. \
../../../../include \
../../../../common \
../../../../storage \
diff --git a/sql/backends/monet5/vaults/shp/Makefile.ag
b/sql/backends/monet5/vaults/shp/Makefile.ag
--- a/sql/backends/monet5/vaults/shp/Makefile.ag
+++ b/sql/backends/monet5/vaults/shp/Makefile.ag
@@ -4,8 +4,8 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-INCLUDES = ../ \
- ../../ \
+INCLUDES = .. \
+ ../.. \
../../../../include \
../../../../common \
../../../../storage \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
