Changeset: fc75ed7a9398 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc75ed7a9398
Modified Files:
clients/mapiclient/Makefile.ag
clients/mapiclient/tomograph.c
tools/mserver/Makefile.ag
Branch: Jul2015
Log Message:
Use installed logo file.
diffs (37 lines):
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -7,6 +7,9 @@
MTSAFE
INCLUDES = ../mapilib ../../common/options ../../common/stream
../R/MonetDB.R/src $(READLINE_INCS)
+# see tools/mserver5/Makefile.ag for location of logo file
+CFLAGS = -DLOGOFILE=\"$(datadir)/doc/MonetDB/monetdblogo.png\"
+
lib_mcutil = {
NOINST
SOURCES = dump.c prompt.c dotmonetdb.c eventparser.c eventparser.h
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1204,8 +1204,7 @@ gnuplotheader(char *filename)
fprintf(gnudata,"unset border\n");
fprintf(gnudata,"unset xtics\n");
fprintf(gnudata,"unset ytics\n");
- // REPLACE THE HARDCODED NAME
- fprintf(gnudata,"plot \"/ufs/mk/monetdb-final.png\" binary filetype=png
dx=0.5 dy=0.5 notitle with rgbimage\n");
+ fprintf(gnudata,"plot \"%s\" binary filetype=png dx=0.5 dy=0.5 notitle
with rgbimage\n", LOGOFILE);
fprintf(gnudata,"unset title\n");
}
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -29,6 +29,7 @@ headers_pdf = {
DIR = datadir/doc/MonetDB-client-tools
}
+# see clients/mapiclient/Makefile.ag for use of logo file
headers_png = {
HEADERS = png
SOURCES = monetdblogo.png
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
