Update of /cvsroot/monetdb/sql/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21625
Modified Files:
Makefile
Log Message:
In case projects are not all installed in the same location, copy some files
from the MonetDB-Common directory over.
U Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/sql/NT/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile 19 May 2008 12:52:05 -0000 1.23
+++ Makefile 20 May 2008 09:07:13 -0000 1.24
@@ -11,6 +11,7 @@
!INCLUDE "$(TOPDIR)\rules.msc"
INSTALLER = MonetDB5-SQL
+INSTALLER_PREREQ = "$(prefix)\banner.bmp" "$(prefix)\license.rtf"
"$(prefix)\monetdb.ico"
!IFDEF HAVE_MONETDB5
RUNMSERVER5 = RunMserver5.bat
@@ -33,7 +34,7 @@
$(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
call RunMtest.bat
-install: targetdirs all $(M4INSTALLER) $(M5INSTALLER)
+install: targetdirs all $(M4INSTALLER) $(M5INSTALLER) $(INSTALLER_PREREQ)
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) MSQLserver.bat "$(prefix)"
$(INSTALL) $(INSTALLER)\$(INSTALLER).sln "$(prefix)"
@@ -43,6 +44,13 @@
$(INSTALL) /Y "$(prefix)"\Debug\$(INSTALLER).msi "$(prefix)"
@-c:\cygwin\bin\chmod a+rx "$(prefix)\$(INSTALLER).msi"
+"$(prefix)\banner.bmp":
+ $(INSTALL) "$(MONETDB_PREFIX)\banner.bmp" "$(prefix)\banner.bmp"
+"$(prefix)\license.rtf":
+ $(INSTALL) "$(MONETDB_PREFIX)\license.rtf" "$(prefix)\license.rtf"
+"$(prefix)\monetdb.ico":
+ $(INSTALL) "$(MONETDB_PREFIX)\monetdb.ico" "$(prefix)\monetdb.ico"
+
!IFDEF BITS32
install-m4installer:
$(INSTALL) MonetDB4-SQL\MonetDB4-SQL-Installer.sln "$(prefix)"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
