[lmi-commits] (no subject)

[Greg Chicares]

branch: master
commit c9acffd4d037501f6c96d3c6c603568c68183eca
Author: Gregory W. Chicares <address@hidden>
Date:   Mon Jun 13 17:19:19 2016 +0000

    Expect 'configurable_settings.xml' only in its canonical location
    
    Since commit 521f8bce06ee613e27df4ecde9a6197a466033f9, this file is
    expected by default in the data directory, not the bin directory.
---
 workhorse.make |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index cd64fe8..e6d3d77 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1048,7 +1048,7 @@ fardel: install
 .PHONY: wrap_fardel
 wrap_fardel:
        @$(CP) $(prefix)/third_party/bin/md5sum$(EXEEXT) .
-       @$(CP) $(bin_dir)/configurable_settings.xml .
+       @$(CP) $(data_dir)/configurable_settings.xml .
        @$(CP) --preserve $(fardel_binaries) $(fardel_files) .
        @$(fardel_date_script)
        @$(MD5SUM) $(fardel_checksummed_files) >validated.md5
@@ -1100,10 +1100,7 @@ test_data := \
 # local copies are provided for as needed.
 
 configurable_settings.xml:
-       @$(CP) --preserve --update $(bin_dir)/$@ .
-
-$(data_dir)/configurable_settings.xml:
-       @$(CP) --preserve --update $(bin_dir)/$(notdir $@) $(data_dir)/.
+       @$(CP) --preserve --update $(data_dir)/$@ .
 
 
################################################################################