[Koha-cvs] CVS: koha/misc buildrelease,1.11,1.12

[Ambrose Li]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv5818/misc

Modified Files:
	buildrelease 
Log Message:
Since "koha-tmpl" is now just a subdirectory in the "koha" CVS module, we
can guess it like so

Noted GNUism in script


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** buildrelease	25 Jan 2003 06:32:34 -0000	1.11
--- buildrelease	25 Jan 2003 18:30:21 -0000	1.12
***************
*** 49,53 ****
  if ($input) {
      $kohadir=$input;
!     $kohahtmldir=guess_kohahtmldir($kohadir, $kohahtmldir) unless $has_kohaautobuild_conf;
  }
  
--- 49,56 ----
  if ($input) {
      $kohadir=$input;
!     unless ($has_kohaautobuild_conf) {
! 	$kohahtmldir=guess_kohahtmldir($kohadir, $kohahtmldir);
! 	$kohatmpldir=guess_kohatmpldir($kohadir, $kohatmpldir);
!     }
  }
  
***************
*** 292,295 ****
--- 295,299 ----
  
  # Copy all CVS files to intranet-cgi
+ # FIXME: "cp -a" is GNU-ism. It is not portable.
  system("cp -a $kohadir/* $rootdir/intranet-cgi");
  
***************
*** 347,354 ****
--- 351,360 ----
  system("find $rootdir/intranet-cgi -name '*.pl' -exec chmod a+x \\{\\} \\;");
  # Copy all CVS files to intranet-html and opac-html
+ # FIXME: "cp -a" is GNU-ism. It is not portable.
  system("cp -a $kohahtmldir/intranet-html/* $rootdir/intranet-html");
  system("cp -a $kohahtmldir/opac-html/* $rootdir/opac-html");
  
  # Copy koha-tmpl files
+ # FIXME: "cp -a" is GNU-ism. It is not portable.
  system('cp', '-a', "$kohatmpldir/opac-tmpl", "$rootdir/opac-html");
  system('cp', '-a', "$kohatmpldir/intranet-tmpl", "$rootdir/intranet-html");
***************
*** 371,374 ****
--- 377,381 ----
  
  
+ # FIXME: Why do we copy from $roothomedir? What is supposed to be there?
  if (-e "$roothomedir/docs") {
      print "Copying docs folder from $roothomedir/docs...";
***************
*** 425,431 ****
      my($kohadir, $default) = @_;
      my $kohatmpldir;
!     # It probably makes sense to assume that the 'koha' and 'koha-tmpl'
!     # modules are checked out within the same parent directory
!     if (-d $kohadir && $kohadir =~ /^(.*)\/[^\/]+$/) {
  	$kohatmpldir = "$1/koha-tmpl"
      } else {
--- 432,441 ----
      my($kohadir, $default) = @_;
      my $kohatmpldir;
!     # "koha-tmpl" is now just a subdirectory within the "koha" module.
!     # Otherwise, it probably makes sense to assume that the "koha" and
!     # "koha-tmpl" modules are checked out within the same parent directory
!     if (-d $kohadir && -d "$kohadir/koha-tmpl") {
! 	$kohatmpldir = "$kohadir/koha-tmpl";
!     } elsif (-d $kohadir && $kohadir =~ /^(.*)\/[^\/]+$/) {
  	$kohatmpldir = "$1/koha-tmpl"
      } else {