From 1cd1a5abd3137b4dd34be48c6d5bce464df4cf01 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 15 Feb 2008 21:04:36 +1300 Subject: [PATCH] install: tweaked 'make update' Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- Makefile.PL | 17 ++++++++--------- install_misc/UpgradeBackup.pm | 6 ++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 79c0375eff..bac9ff9fdc 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1400,16 +1400,15 @@ upgrade :: make_upgrade_backup install \t\$(NOECHO) \$(NOOP) make_upgrade_backup :: \t\$(NOECHO) umask 022; \$(MOD_BACKUP) \\ -\t\t\$(KOHA_INST_KOHA_CONF_DIR) \$(KOHA_DEST_KOHA_CONF_DIR) \\ -\t\t\$(KOHA_INST_INTRANET_TMPL_DIR) \$(KOHA_DEST_INTRANET_TMPL_DIR) \\ -\t\t\$(KOHA_INST_INTRANET_WWW_DIR) \$(KOHA_DEST_INTRANET_WWW_DIR) \\ -\t\t\$(KOHA_INST_OPAC_TMPL_DIR) \$(KOHA_DEST_OPAC_TMPL_DIR) \\ -\t\t\$(KOHA_INST_OPAC_WWW_DIR) \$(KOHA_DEST_OPAC_WWW_DIR) \\ -\t\t\$(KOHA_INST_OPAC_TMPL_DIR) \$(KOHA_DEST_OPAC_TMPL_DIR) \\ -\t\t\$(KOHA_INST_OPAC_WWW_DIR) \$(KOHA_DEST_OPAC_WWW_DIR) \\ -\t\t\$(KOHA_INST_PAZPAR2_CONF_DIR) \$(KOHA_DEST_PAZPAR2_CONF_DIR) \\ -\t\t\$(KOHA_INST_ZEBRA_CONF_DIR) \$(KOHA_DEST_ZEBRA_CONF_DIR) /; + foreach my $key (qw/KOHA_CONF_DIR INTRANET_TMPL_DIR INTRANET_WWW_DIR OPAC_TMPL_DIR OPAC_WWW_DIR + PAZPAR2_CONF_DIR ZEBRA_CONF_DIR/) { + $upgrade .= "\t\t\$(KOHA_INST_$key) \$(KOHA_DEST_$key) \\\n" + unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or + exists $skip_directories->{$key} or + not exists $target_directories->{$key}; + } + $upgrade =~ s/\\\n$/\n/; return $upgrade; } diff --git a/install_misc/UpgradeBackup.pm b/install_misc/UpgradeBackup.pm index 869d1e13dc..f27a71b090 100644 --- a/install_misc/UpgradeBackup.pm +++ b/install_misc/UpgradeBackup.pm @@ -81,6 +81,12 @@ sub backup_changed_files { =head1 AUTHOR +Code based on parts of ExtUtils::Install in order to +approximately track how it identifies files to +install. + +Koha Development Team + Galen Charlton =cut -- 2.39.2