Substitute configure variables appropriately in fast-extract

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15341 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am
index 1a70c46..ca873b1 100644 (file)
--- a/Open-ILS/src/Makefile.am
+++ b/Open-ILS/src/Makefile.am
@@ -75,7 +75,6 @@ core_scripts =   $(examples)/oils_ctl.sh \
                 $(supportscr)/long-overdue-status-update.pl \
                 $(supportscr)/action_trigger_runner.pl \
                 $(srcdir)/extras/openurl_map.pl \
-                $(srcdir)/extras/fast-extract \
                 $(srcdir)/extras/import/marc_add_ids
         
 installautojs = $(autojsbinscripts)
@@ -135,7 +134,7 @@ if BUILDEGJAVA
 OILSJAVA_DIR = java
 endif
 
-bin_SCRIPTS = $(core_scripts) $(reporter_scripts) $(installautojs) @srcdir@/extras/eg_config
+bin_SCRIPTS = $(core_scripts) $(reporter_scripts) $(installautojs) @srcdir@/extras/eg_config @srcdir@/extras/fast-extract
 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/extras/fast-extract b/Open-ILS/src/extras/fast-extract.in
similarity index 96%
rename from Open-ILS/src/extras/fast-extract
rename to Open-ILS/src/extras/fast-extract.in
index d5fddf6..32f122a 100755 (executable)
--- a/Open-ILS/src/extras/fast-extract
+++ b/Open-ILS/src/extras/fast-extract.in
@@ -18,7 +18,7 @@ binmode(STDOUT, ':utf8');
 
 $| = 1;
 
-my ($config, $delim, $after,$deleted) = ('SYSCONFDIR/opensrf_core.xml', ' | ');
+my ($config, $delim, $after,$deleted) = ('@sysconfdir@/opensrf_core.xml', ' | ');
 
 GetOptions(
        "after=s"       => \$after,

diff --git a/configure.ac b/configure.ac
index 229e4d7..547d8ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -322,7 +322,12 @@ AC_CONFIG_FILES([Makefile
                 Open-ILS/src/Makefile
                 Open-ILS/web/Makefile
                 Open-ILS/xul/staff_client/Makefile
-                Open-ILS/src/extras/eg_config],  [if test -e "./Open-ILS/src/extras/eg_config"; then chmod 755 Open-ILS/src/extras/eg_config; fi])
+                Open-ILS/src/extras/eg_config
+                Open-ILS/src/extras/fast-extract],
+               [
+                       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;
+               ])
 AC_OUTPUT
 
 #-------------------------------------------------