From af4c06b3ac490790e5fe107103db81da01239730 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 3 Jan 2003 16:17:34 +0000
Subject: [PATCH] road to 1.3.3 releasing...

---
 misc/Install.pm   |  6 +++---
 misc/buildrelease | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/misc/Install.pm b/misc/Install.pm
index 33386a484b..e27f134aa7 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -1024,8 +1024,8 @@ opacdir=$::opacdir
 kohalogdir=$::kohalogdir
 kohaversion=$::kohaversion
 httpduser=$::httpduser
-intrahtdocs=$::intranetdir/htdocs/includes/templates
-opachtdocs=$::opacdir/htdocs/includes/templates
+intrahtdocs=$::intranetdir/htdocs/intranet-tmpl
+opachtdocs=$::opacdir/htdocs/opac-tmpl
 |;
     close(SITES);
     umask($old_umask);
@@ -1124,7 +1124,7 @@ are doing.  To change your MySql root password use the mysqladmin command:
 
 mysqladmin password NEWPASSWORDHERE
 
-Press <ENTER> to continue: 
+Press <ENTER> to continue:
 |;
 
 sub databasesetup {
diff --git a/misc/buildrelease b/misc/buildrelease
index 7f576dbd2c..ba4f63abdc 100644
--- a/misc/buildrelease
+++ b/misc/buildrelease
@@ -270,7 +270,7 @@ system("mv $rootdir/intranet-cgi/C4 $rootdir/modules");
 system("mv $rootdir/intranet-cgi/misc/info/* $rootdir");
 system("mv $rootdir/intranet-cgi/misc/installer.pl $rootdir");
 system("mv $rootdir/intranet-cgi/misc/koha.upgrade $rootdir");
-system("mv $rootdir/intranet-cgi/Install.pm $rootdir"); #does not exist ??
+system("mv $rootdir/intranet-cgi/misc/Install.pm $rootdir");
 #system("mv $rootdir/intranet-cgi/kohareporter $rootdir"); # does not exist ??
 chmod 0770, "$rootdir/installer.pl";
 chmod 0770, "$rootdir/koha.upgrade";
@@ -320,9 +320,9 @@ system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");
 system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
 
 # Move koha-tmpl files
-#system("mv $rootdir/intranet-cgi/koha-tmpl/opac-tmpl/* $rootdir/opac-html");
-#system("mv $rootdir/intranet-cgi/koha-tmpl/intranet-tmpl/* $rootdir/intranet-html");
-#system("rm -rf $rootdir/intranet-cgi/koha-tmpl");
+system("mv $rootdir/intranet-cgi/koha-tmpl/opac-tmpl $rootdir/opac-html");
+system("mv $rootdir/intranet-cgi/koha-tmpl/intranet-tmpl $rootdir/intranet-html");
+system("rm -rf $rootdir/intranet-cgi/koha-tmpl");
 
 # Remove extraneous files from opac-html
 system("rm -f $rootdir/opac-html/koha.mo");
@@ -351,7 +351,7 @@ if (-e "$roothomedir/docs") {
 
 chdir("/tmp");
 system("tar czf /tmp/koha-$releaseversion.tar.gz koha-".$releaseversion);
-system("rm -rf $rootdir");
+#system("rm -rf $rootdir");
 
 print qq|
 ============
-- 
2.39.5