From 01b201e842132ea807d1a23f27bf749beeed2cd4 Mon Sep 17 00:00:00 2001 From: dbs Date: Sun, 30 Jan 2011 05:47:52 +0000 Subject: [PATCH] Replace a hard-coded path in Cronscript.pm with a configure variable As much as possible, we need to avoid hard-coded paths if we ever want to be packagable. git-svn-id: svn://svn.open-ils.org/ILS/trunk@19338 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../perlmods/OpenILS/Utils/{Cronscript.pm => Cronscript.pm.in} | 2 +- configure.ac | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename Open-ILS/src/perlmods/OpenILS/Utils/{Cronscript.pm => Cronscript.pm.in} (98%) diff --git a/Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm b/Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm.in similarity index 98% rename from Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm rename to Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm.in index ab2152b39b..73281fbc60 100644 --- a/Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm +++ b/Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm.in @@ -51,7 +51,7 @@ sub _default_self { # default_opts_clean => {}, default_opts => { 'lock-file=s' => OpenILS::Utils::Lockfile::default_filename, - 'osrf-config=s' => '/openils/conf/opensrf_core.xml', # TODO: packaging needs a make variable like @@EG_CONF_DIR@@ + 'osrf-config=s' => '@sysconfdir@/opensrf_core.xml', 'debug' => 0, 'verbose+' => 0, 'help' => 0, diff --git a/configure.ac b/configure.ac index 3d70cb3488..83e20852fc 100644 --- a/configure.ac +++ b/configure.ac @@ -374,7 +374,8 @@ AC_CONFIG_FILES([Makefile Open-ILS/updates/Makefile Open-ILS/xul/staff_client/Makefile Open-ILS/src/extras/eg_config - Open-ILS/src/extras/fast-extract], + Open-ILS/src/extras/fast-extract + Open-ILS/src/perlmods/OpenILS/Utils/Cronscript.pm], [ if test -e "./Open-ILS/src/extras/eg_config"; then chmod 755 Open-ILS/src/extras/eg_config; fi; if test -e "./Open-ILS/src/extras/fast-extract"; then chmod 755 Open-ILS/src/extras/fast-extract; fi; -- 2.43.2