Index: lams_common/build.xml
===================================================================
diff -u -r398502df84329159a1ea837da17b1d06888a1e78 -r74425344d3f74d26c7b6704e8e60c8fe94d14ec3
--- lams_common/build.xml	(.../build.xml)	(revision 398502df84329159a1ea837da17b1d06888a1e78)
+++ lams_common/build.xml	(.../build.xml)	(revision 74425344d3f74d26c7b6704e8e60c8fe94d14ec3)
@@ -306,9 +306,11 @@
 		<copy overwrite="yes" todir="${build}">
 			<fileset dir="${db.scripts}/">
 				<include name="${lamsconf.table.sql}" />
+                                <include name="create_lams_11_db.sql" />
 			</fileset>
 	        <filterset>
 	            <filter token="datetimestamp" value="${DSTAMP}${TSTAMP}"/>
+                    <filter token="dbname" value="${db.name}"/>
 	        </filterset>
 		</copy>
 
@@ -317,7 +319,7 @@
 			<classpath>
 				<pathelement location="${db.driver.jar}"/>
 			</classpath>
-			<transaction src="${db.scripts}/create_lams_11_db.sql"/>
+			<transaction src="${build}/create_lams_11_db.sql"/>
 			<transaction src="${db.scripts}/drop_lams_11_tables.sql"/>
 			<transaction src="${db.scripts}/create_lams_11_tables.sql"/>
 			<!-- Create tables for LAMS and other application's integration -->
@@ -334,6 +336,7 @@
 		</sql>
 		
 		<delete dir="${contentrepository.directory}"/>
+                <delete file="${build}/create_lams_11_db.sql"/>
 	</target>
 
 	<!-- =================================================================== -->
Index: lams_common/db/sql/create_lams_11_db.sql
===================================================================
diff -u -rd954e17fe98a476d678ef291f332d884723ff641 -r74425344d3f74d26c7b6704e8e60c8fe94d14ec3
--- lams_common/db/sql/create_lams_11_db.sql	(.../create_lams_11_db.sql)	(revision d954e17fe98a476d678ef291f332d884723ff641)
+++ lams_common/db/sql/create_lams_11_db.sql	(.../create_lams_11_db.sql)	(revision 74425344d3f74d26c7b6704e8e60c8fe94d14ec3)
@@ -1,8 +1,8 @@
 -- CVS ID: $Id$
   
 SET FOREIGN_KEY_CHECKS=0;
-DROP DATABASE IF EXISTS lams;
-CREATE DATABASE lams DEFAULT CHARACTER SET utf8;
+DROP DATABASE IF EXISTS @dbname@;
+CREATE DATABASE @dbname@ DEFAULT CHARACTER SET utf8;
 SET FOREIGN_KEY_CHECKS=1;
 
 --USE mysql;
@@ -32,6 +32,6 @@
 	
 --FLUSH PRIVILEGES;
 
-USE lams;
+USE @dbname@;
 
 SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file