From 1b1839b07f6b4b524e6f3c9596531ff96035e092 Mon Sep 17 00:00:00 2001 From: gmc Date: Wed, 20 Apr 2011 13:47:09 +0000 Subject: [PATCH] add marc_export to list of scripts installed in /openils/bin Signed-off-by: Galen Charlton git-svn-id: svn://svn.open-ils.org/ILS/trunk@20237 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/Makefile.am | 2 +- Open-ILS/src/support-scripts/{marc_export => marc_export.in} | 4 ++-- configure.ac | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) rename Open-ILS/src/support-scripts/{marc_export => marc_export.in} (99%) diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am index 7f9611106c..7d52ad5b24 100644 --- a/Open-ILS/src/Makefile.am +++ b/Open-ILS/src/Makefile.am @@ -139,7 +139,7 @@ if BUILDEGJAVA OILSJAVA_DIR = java endif -bin_SCRIPTS = $(core_scripts) $(reporter_scripts) $(installautojs) @srcdir@/extras/eg_config @srcdir@/extras/fast-extract @srcdir@/extras/import/marc2are.pl @srcdir@/extras/import/marc2bre.pl @srcdir@/extras/import/marc2sre.pl @srcdir@/extras/import/parallel_pg_loader.pl +bin_SCRIPTS = $(core_scripts) $(reporter_scripts) $(installautojs) @srcdir@/extras/eg_config @srcdir@/extras/fast-extract @srcdir@/extras/import/marc2are.pl @srcdir@/extras/import/marc2bre.pl @srcdir@/extras/import/marc2sre.pl @srcdir@/extras/import/parallel_pg_loader.pl $(supportscr)/marc_export data_DATA = $(core_data) $(reporter_data) # Take care of which subdirectories to build, and which extra files to include in a distribution. diff --git a/Open-ILS/src/support-scripts/marc_export b/Open-ILS/src/support-scripts/marc_export.in similarity index 99% rename from Open-ILS/src/support-scripts/marc_export rename to Open-ILS/src/support-scripts/marc_export.in index 3fe5ec1816..08a164e918 100755 --- a/Open-ILS/src/support-scripts/marc_export +++ b/Open-ILS/src/support-scripts/marc_export.in @@ -23,7 +23,7 @@ use Getopt::Long; my @formats = qw/USMARC UNIMARC XML BRE ARE/; -my $config = '/openils/conf/opensrf_core.xml'; +my $config = '@sysconfdir@/opensrf_core.xml'; my $format = 'USMARC'; my $encoding = 'MARC8'; my $location = ''; @@ -72,7 +72,7 @@ in their ID sequences. Usage: $0 [options] --help or -h This screen. - --config or -c Configuration file [/openils/conf/opensrf_core.xml] + --config or -c Configuration file [@sysconfdir@/opensrf_core.xml] --format or -f Output format (USMARC, UNIMARC, XML, BRE, ARE) [USMARC] --encoding or -e Output encoding (UTF-8, ISO-8859-?, MARC8) [MARC8] --xml-idl or -x Location of the IDL XML diff --git a/configure.ac b/configure.ac index 335ab4fe4b..81312585fb 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/marc_export Open-ILS/src/perlmods/Makefile Open-ILS/src/perlmods/lib/OpenILS/Utils/Cronscript.pm], [ @@ -387,6 +388,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/marc_export"; then chmod 755 Open-ILS/src/support-scripts/marc_export; fi; ]) AC_OUTPUT -- 2.43.2