Changeset: be1ecfd84d0a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be1ecfd84d0a
Modified Files:
tools/embedded/build-rpkg.sh
tools/embedded/rpackage/configure.win
Branch: embedded
Log Message:
config win
diffs (24 lines):
diff --git a/tools/embedded/build-rpkg.sh b/tools/embedded/build-rpkg.sh
--- a/tools/embedded/build-rpkg.sh
+++ b/tools/embedded/build-rpkg.sh
@@ -34,6 +34,7 @@ find . -name "Makefile.in" -exec sed -i
cd ..
mv sourcetree/tools/embedded/rpackage .
rsync -av --exclude-from sourcetree/tools/embedded/pkg-excludes sourcetree/
rpackage/src
+cp sourcetree/NT/monetdb_config.h.in rpackage/src/tools/embedded/windows/
export R_INCLUDE_DIR=`R CMD config --cppflags | sed s/^-I//`
diff --git a/tools/embedded/rpackage/configure.win
b/tools/embedded/rpackage/configure.win
--- a/tools/embedded/rpackage/configure.win
+++ b/tools/embedded/rpackage/configure.win
@@ -12,7 +12,8 @@ fi
# patch sedscript for build/install/library paths
sed -e "s|%BITS%|$BITS|" -e "s|%PREFIX%|${R_PACKAGE_DIR}/libs|" -e
"s|%SRCDIR%|$SRC|" -e "s|%RINCLUDE%|${R_HOME}/include|"
src/tools/embedded/windows/sedscript.tpl > src/tools/embedded/windows/sedscript
-cp src/NT/monetdb_config.h.in src/
+# this is copied from NT/monetdb_config.h.in in the packaging script
+cp src/tools/embedded/windows/monetdb_config.h.in src/
# pmc stands for "poor man's configure", it does something similar using the
sedscript
sh src/tools/embedded/windows/pmc.sh
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
