Changeset: e4260ee68e5f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4260ee68e5f
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Apr2011 branch.
diffs (120 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -573,12 +573,6 @@
}
"Entry"
{
- "MsmKey" = "8:_7F9C47C139394604A78AD5B95A87B3E8"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_7FDA7780804D42D693497FADFFBE6ABD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3083,26 +3077,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7F9C47C139394604A78AD5B95A87B3E8"
- {
- "SourcePath" = "8:etc\\monetdb5.conf"
- "TargetName" = "8:monetdb5.conf"
- "Tag" = "8:"
- "Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7FDA7780804D42D693497FADFFBE6ABD"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\23_skyserver.sql"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -573,12 +573,6 @@
}
"Entry"
{
- "MsmKey" = "8:_7F9C47C139394604A78AD5B95A87B3E8"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_7FDA7780804D42D693497FADFFBE6ABD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3083,26 +3077,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7F9C47C139394604A78AD5B95A87B3E8"
- {
- "SourcePath" = "8:etc\\monetdb5.conf"
- "TargetName" = "8:monetdb5.conf"
- "Tag" = "8:"
- "Folder" = "8:_B5DFB5D13EE441F8B42616036AACB603"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7FDA7780804D42D693497FADFFBE6ABD"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\23_skyserver.sql"
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -60,7 +60,7 @@
#define DIR_SEP_STR "\\"
/* architecture-dependent files */
-#define EXEC_PREFIX "${prefix}"
+#define EXEC_PREFIX PREFIX
/* Define to 1 if you have `alloca', as a function or macro. */
#define HAVE_ALLOCA 1
@@ -641,10 +641,10 @@
#endif
/* object code libraries */
-#define LIBDIR "${exec_prefix}\\lib"
+#define LIBDIR EXEC_PREFIX "\\lib"
/* modifiable single-machine data */
-#define LOCALSTATEDIR "${prefix}\\var"
+#define LOCALSTATEDIR PREFIX "\\var"
#define lstat stat
#define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG)
@@ -813,7 +813,7 @@
#define STDC_HEADERS 1
/* read-only single-machine data */
-#define SYSCONFDIR "${prefix}\\etc"
+#define SYSCONFDIR PREFIX "\\etc"
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
/* #undef TIME_WITH_SYS_TIME */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
