Changeset: 125ddfab6a12 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=125ddfab6a12
Modified Files:
tools/embedded/windows/libtool.sh
tools/embedded/windows/pmc.sh
tools/embedded/windows/sedscript
Branch: embedded
Log Message:
windows update
diffs (153 lines):
diff --git a/tools/embedded/windows/libtool.sh
b/tools/embedded/windows/libtool.sh
--- a/tools/embedded/windows/libtool.sh
+++ b/tools/embedded/windows/libtool.sh
@@ -1,7 +1,6 @@
shift
# this rewrites libtool linker commands into ar commands
# because windows gcc cannot have dangling references
-
if [ "$1" = "--mode=link" ]; then
shift
shift
@@ -13,7 +12,7 @@ if [ "$1" = "--mode=link" ]; then
do
case "$1" in
-rpath)
- #shift # cough, cough
+ shift # cough, cough
# TODO
;;
-version-info) ;;
@@ -35,7 +34,8 @@ if [ "$1" = "--mode=link" ]; then
done
echo $call
$call
-
+elif [ "$1" = "cp" ]; then
+ "$@"
else
shift
echo "$@"
diff --git a/tools/embedded/windows/pmc.sh b/tools/embedded/windows/pmc.sh
--- a/tools/embedded/windows/pmc.sh
+++ b/tools/embedded/windows/pmc.sh
@@ -1,3 +1,7 @@
+#echo $R_INCLUDE_DIR
+#echo $R_PACKAGE_DIR
+#echo $R_ARCH
+
if [ $# -eq 1 ]; then
NN=`echo $1 | sed 's/.in$//'`
echo $1
diff --git a/tools/embedded/windows/sedscript b/tools/embedded/windows/sedscript
--- a/tools/embedded/windows/sedscript
+++ b/tools/embedded/windows/sedscript
@@ -27,7 +27,7 @@ s|@AUTOHEADER@||
s|@AUTOMAKE@||
s|@AWK@|gawk|
s|@BASH@|sh|
-s|@bindir@||
+s|@bindir@|${exec_prefix}/bin|
s|@bits@||
s|@BUILD@||
s|@build@||
@@ -54,8 +54,8 @@ s|@curl_CFLAGS@||
s|@curl_LIBS@||
s|@CYGPATH_W@||
s|@CYGPATH_WP@||
-s|@datadir@||
-s|@datarootdir@||
+s|@datadir@|${prefix}/share|
+s|@datarootdir@|${prefix}/share|
s|@DEFS@||
s|@DEPDIR@||
s|@DIFF@||
@@ -73,7 +73,7 @@ s|@EGREP@||
s|@Elocalstatedir@||
s|@Elogdir@||
s|@Erundir@||
-s|@exec_prefix@||
+s|@exec_prefix@|${prefix}|
s|@EXEEXT@||
s|@FGREP@||
s|@GDK_VERSION@||
@@ -89,13 +89,13 @@ s|@host_cpu@||
s|@host_os@||
s|@host_vendor@||
s|@htmldir@||
-s|@includedir@||
+s|@includedir@|${prefix}/include|
s|@infodir@||
-s|@INSTALL@||
-s|@INSTALL_BACKUP@||
-s|@INSTALL_DATA@||
-s|@INSTALL_PROGRAM@||
-s|@INSTALL_SCRIPT@||
+s|@INSTALL@|cp|
+s|@INSTALL_BACKUP@|cp|
+s|@INSTALL_DATA@|cp|
+s|@INSTALL_PROGRAM@|cp|
+s|@INSTALL_SCRIPT@|cp|
s|@install_sh@|${SHELL} $(top_builddir)/buildtools/conf/install-sh|
s|@INSTALL_STRIP_PROGRAM@||
s|@JAR@||
@@ -108,8 +108,8 @@ s|@JAVA_VERSION@||
s|@KVM_LIBS@||
s|@LD@||
s|@LDFLAGS@||
-s|@libdir@||
-s|@libexecdir@||
+s|@libdir@|${exec_prefix}/lib|
+s|@libexecdir@|${exec_prefix}/libexec|
s|@LIBICONV@||
s|@libmicrohttpd_CFLAGS@||
s|@libmicrohttpd_LIBS@||
@@ -126,8 +126,8 @@ s|@LINUX_DIST@||
s|@LIPO@||
s|@LN_S@||
s|@localedir@||
-s|@localstatedir@||
-s|@logdir@||
+s|@localstatedir@|${prefix}/var|
+s|@logdir@|${prefix}/log/monetdb|
s|@LTLIBICONV@||
s|@LTLIBOBJS@||
s|@LT_SYS_LIBRARY_PATH@||
@@ -137,8 +137,8 @@ s|@mandir@||
s|@MANIFEST_TOOL@||
s|@MAPI_VERSION@||
s|@MATH_LIBS@||
-s|@MKDIR_P@||
-s|@mkdir_p@||
+s|@MKDIR_P@|mkdir -p|
+s|@mkdir_p@|mkdir -p|
s|@MONETDB5_PASSWDHASH@||
s|@MONETDB5_VERSION@||
s|@MSGCONTROL_FLAGS@||
@@ -179,7 +179,7 @@ s|@PKG_CONFIG_LIBDIR@||
s|@PKG_CONFIG_PATH@||
s|@PKG_CURL@||
s|@PKG_ZLIB@||
-s|@prefix@||
+s|@prefix@|C:/Users/Vanilla/ta-install/|
s|@program_transform_name@||
s|@psdir@||
s|@PTHREAD_INCS@||
@@ -231,7 +231,7 @@ s|@READLINE_INCS@||
s|@READLINE_LIBS@||
s|@READLINK@||
s|@RHOME@||
-s|@RM@||
+s|@RM@|rm -f|
s|@RPMBUILD@||
s|@RUBY@||
s|@RUBYGEM@||
@@ -239,7 +239,7 @@ s|@RUBY_DIR@||
s|@rundir@||
s|@SAMTOOLS_CFLAGS@||
s|@SAMTOOLS_LIBS@||
-s|@sbindir@||
+s|@sbindir@|${exec_prefix}/sbin|
s|@SED@||
s|@SET_MAKE@||
s|@sharedstatedir@||
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
