From a2552ae059c3de551da8a81a9dea47b680918938 Mon Sep 17 00:00:00 2001 From: dbs Date: Sun, 1 May 2011 12:20:55 +0000 Subject: [PATCH] Remove hard-coded default bootstrap location from authority_control_fields.pl Let autoconf do its magic and we get away from one more hard-coded default. Signed-off-by: Dan Scott git-svn-id: svn://svn.open-ils.org/ILS/trunk@20359 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- ...ority_control_fields.pl => authority_control_fields.pl.in} | 4 ++-- configure.ac | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) rename Open-ILS/src/support-scripts/{authority_control_fields.pl => authority_control_fields.pl.in} (99%) diff --git a/Open-ILS/src/support-scripts/authority_control_fields.pl b/Open-ILS/src/support-scripts/authority_control_fields.pl.in similarity index 99% rename from Open-ILS/src/support-scripts/authority_control_fields.pl rename to Open-ILS/src/support-scripts/authority_control_fields.pl.in index f8864d0e2c..07c9f77f10 100755 --- a/Open-ILS/src/support-scripts/authority_control_fields.pl +++ b/Open-ILS/src/support-scripts/authority_control_fields.pl.in @@ -30,7 +30,7 @@ use Data::Dumper; use Pod::Usage qw/ pod2usage /; my ($start_id, $end_id); -my $bootstrap = '/openils/conf/opensrf_core.xml'; +my $bootstrap = '@sysconfdir@/opensrf_core.xml'; my @records; my %options; @@ -503,7 +503,7 @@ table identifying the record ID, field, and subfield(s) that were not controlled =item * B<-c> I, B<--configuration>=I Specifies the OpenSRF configuration file used to connect to the OpenSRF router. -Defaults to F +Defaults to F<@sysconfdir@/opensrf_core.xml> =item * B<-r> I, B<--record>=I diff --git a/configure.ac b/configure.ac index 81312585fb..dd0b098b5f 100644 --- a/configure.ac +++ b/configure.ac @@ -378,6 +378,7 @@ AC_CONFIG_FILES([Makefile Open-ILS/src/extras/import/marc2bre.pl Open-ILS/src/extras/import/marc2sre.pl Open-ILS/src/extras/import/parallel_pg_loader.pl + Open-ILS/src/support-scripts/authority_control_fields.pl Open-ILS/src/support-scripts/marc_export Open-ILS/src/perlmods/Makefile Open-ILS/src/perlmods/lib/OpenILS/Utils/Cronscript.pm], @@ -388,6 +389,7 @@ AC_CONFIG_FILES([Makefile if test -e "./Open-ILS/src/extras/import/marc2bre.pl"; then chmod 755 Open-ILS/src/extras/import/marc2bre.pl; fi; if test -e "./Open-ILS/src/extras/import/marc2sre.pl"; then chmod 755 Open-ILS/src/extras/import/marc2sre.pl; fi; if test -e "./Open-ILS/src/extras/import/parallel_pg_loader.pl"; then chmod 755 Open-ILS/src/extras/import/parallel_pg_loader.pl; fi; + if test -e "./Open-ILS/src/support-scripts/authority_control_fields.pl"; then chmod 755 Open-ILS/src/support-scripts/authority_control_fields.pl; fi; if test -e "./Open-ILS/src/support-scripts/marc_export"; then chmod 755 Open-ILS/src/support-scripts/marc_export; fi; ]) AC_OUTPUT -- 2.43.2