Corrected Makefile.PL to move kohaversion.pl to cgi-bin/koha

[koha.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
old mode 100644 (file)
new mode 100755 (executable)
index edd7781..1c00a9d
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -17,7 +17,8 @@
 #
 # Current maintainer MJR http://mjr.towers.org.uk/
 # See http://www.koha.org/wiki/?page=KohaInstaller
-
+#
+# 2007-11-05 Corrected CGI copy to include entire 'installer' subdir structure. -fbcit
 use ExtUtils::MakeMaker;
 use POSIX;
 
@@ -29,19 +30,28 @@ Makefile.PL - Koha packager and installer
 
 =head1 SYNOPSIS
 
+=head2 BASIC INSTALLATION
+
        perl Makefile.PL
        make
        sudo make install
+
+=head2 PACKAGING RELEASE TARBALLS
+
        make manifest tardist
        make manifest zipdist
 
+=head2 CLEANING UP
+
+       make clean
+
 =head1 DESCRIPTION
 
 This is a packager and installer that uses
 ExtUtils::MakeMaker, which is fairly common
 on perl systems.
 As well as building tar or zip files
-and installing,
+and installing with the above commands,
 it allows us to check pre-requisites
 and generate configuration files.
 
@@ -65,14 +75,15 @@ Hash of file mappings
 
 =head2 CONFIGURE
 
-Maybe use prompt() here in future to get configuration values at installation time.
+Maybe use prompt() here in future to get configuration values 
+interactively at installation time.
 
 =head2 PL_FILES
 
 This is a hash of PL scripts to run after installation and
 the files to ask them to generate.
 Maybe use the values from CONFIGURE
-to generate initial configuration files.
+to generate initial configuration files in future.
 
 =cut
 
@@ -92,18 +103,14 @@ WriteMakefile(
 'DBD::mysql' => 3.0008,
 'DBI' => 1.53,
 'Data::Dumper' => 2.121_08,
-'Data::Random' => 0.05,
 'Date::Calc' => 5.4,
 'Date::Manip' => 5.44,
 'Digest::MD5' => 2.36,
-'Event' => 1.06,
 'File::Temp' => 0.16,
 'GD::Barcode::UPCE' => 1.1,
 'Getopt::Long' => 2.35,
 'Getopt::Std' => 1.05,
-'HTML::Template' => 2.8,
 'HTML::Template::Pro' => 0.65,
-'HTML::Tree' => 3.1901,
 'HTTP::Cookies' => 1.39,
 'HTTP::Request::Common' => 1.26,
 'LWP::Simple' => 1.41,
@@ -117,27 +124,28 @@ WriteMakefile(
 'MIME::Base64' => 3.07,
 'MIME::QuotedPrint' => 3.07,
 'Mail::Sendmail' => 0.79,
-'Net::Z3950' => 0,
-'Net::Z3950::ZOOM' => 1.16,
 'PDF::API2' => 2.000,
 'PDF::API2::Page' => 2.000,
 'PDF::API2::Util' => 2.000,
 'PDF::Reuse' => 0.33,
 'PDF::Reuse::Barcode' => 0.05,
 'POSIX' => 1.09,
+'Schedule::At' => 1.06',
 'Term::ANSIColor' => 1.10,
 'Test' => 1.25,
 'Test::Harness' => 2.56,
 'Test::More' => 0.62,
+'Test::CSV' => 0.01,
 'Text::Wrap' => 2005.082401,
 'Time::HiRes' => 1.86,
 'Time::localtime' => 1.02,
 'Unicode::Normalize' => 0.32,
+'XML::Dumper' => 0.81,
 'XML::LibXML' => 1.59,
 'XML::SAX::ParserFactory' => 1.01,
 'XML::Simple' => 2.14,
 'XML::RSS' => 1.31,
-'ZOOM' => 0,
+'ZOOM' => 1.16,
         },
 
        # File tree mapping
@@ -153,10 +161,11 @@ WriteMakefile(
 
    PL_FILES => { # generator => target(s)
       'rewrite-config.PL' => [
-         '$(INST_LIBDIR)/koha/etc/koha-conf.xml',
-         '$(INST_LIBDIR)/koha/etc/koha-httpd.conf',
-         '$(INST_LIBDIR)/koha/etc/zebra-biblios.cfg',
-         '$(INST_LIBDIR)/koha/etc/zebra-authorities.cfg'
+         '$(PREFIX)/share/koha/etc/koha-conf.xml',
+         '$(PREFIX)/share/koha/etc/koha-httpd.conf',
+         '$(PREFIX)/share/koha/etc/zebradb/etc/passwd',
+         '$(PREFIX)/share/koha/etc/zebradb/zebra-biblios.cfg',
+         '$(PREFIX)/share/koha/etc/zebradb/zebra-authorities.cfg'
          ]
    }
 #     'opac/getfromintranet.PL' => ['$(INST_LIBDIR)/opac/cgi-bin/detail.pl','$(INST_LIBDIR)/opac/cgi-bin/moredetail.pl','$(INST_LIBDIR)/opac/cgi-bin/search.pl','$(INST_LIBDIR)/opac/cgi-bin/subjectsearch.pl','$(INST_LIBDIR)/opac/cgi-bin/logout.pl'],
@@ -178,7 +187,7 @@ WriteMakefile(
 =head2 map_tree
 
 This function lists all files and where to install each one.
-It returns a hash reference suitable for PM.
+It returns a hash reference suitable for the PM variable above.
 
 =cut
 
@@ -196,15 +205,15 @@ C4/*.pm is copied to perl's lib namespace.
 
 =pod
 
-CGIs are copied to koha/cgi-bin
-and other scripts to koha/scripts.
+CGIs are copied to $(PREFIX)/lib/cgi-bin/koha/
+and other scripts to koha/
 
 =cut
-       foreach my $src ("mainpage.pl","help.pl",glob("*/*.pl"),glob("installer/*.pm"),glob("*/*/*.pl"),glob("*/*/*/*.pl")) {
+       foreach my $src ("mainpage.pl","help.pl","kohaversion.pl",glob("*/*.pl"),glob("installer/*"),glob("installer/*/*/*/*"),glob("*/*/*.pl"),glob("*/*/*/*.pl")) {
                if ($src =~ /(misc|updater|rss)\//) {
-                       $result{$src} = '$(INST_LIBDIR)/koha/scripts/'.$src;
+                       $result{$src} = '$(INST_LIBDIR)/koha/'.$src;
                } else {
-                       $result{$src} = '$(INST_LIBDIR)/koha/cgi-bin/'.$src;
+                       $result{$src} = '$(PREFIX)/lib/cgi-bin/koha/'.$src;
                }
        }
 
@@ -226,12 +235,14 @@ excluding non-files, CVS files and whitespace in filenames.
        }
 =pod
 
-etc files are copied to koha/etc
+etc files are copied to /usr/share/koha/etc/
 
 =cut
        # Misc etc to koha/etc
-       foreach my $src (glob("etc/*")) {
-               $result{$src} = '$(INST_LIBDIR)/koha/'.$src;
+       foreach my $src (glob("etc/zebradb/*/*/*"),glob("etc/zebradb/*/*"),glob("etc/zebradb/*"),glob("etc/*")) {
+               if (-f $src) {
+                       $result{$src} = '$(PREFIX)/share/koha/'.$src;
+               }
        }