[lmi-commits] [lmi] master 1e41c3b 3/4: Create fardels in a particular subdirectory, to avoid clutter

[Greg Chicares]

branch: master
commit 1e41c3befad9f000cb39501394f3ad9709c9cb90
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Create fardels in a particular subdirectory, to avoid clutter
    
    Refactored, introducing a new $(fardel_root), because merely overriding
    $(fardel_dir) caused the 'tar' command to fail.
---
 workhorse.make | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index d5ee253..714db55 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1120,7 +1120,8 @@ archive_shared_data_files:
 #  - extra_fardel_checksummed_files
 
 fardel_name := lmi-$(yyyymmddhhmm)
-fardel_dir  := $(prefix)/$(fardel_name)
+fardel_root := $(prefix)/fardels
+fardel_dir  := $(fardel_root)/$(fardel_name)
 
 # The obvious y2038 problem is ignored because any breakage it causes
 # will be, well, obvious.
@@ -1190,7 +1191,7 @@ fardel_checksummed_files = \
 fardel: install
        address@hidden -d $(fardel_dir) ] || $(MKDIR) --parents $(fardel_dir)
        @$(MAKE) --file=$(this_makefile) --directory=$(fardel_dir) wrap_fardel
-       @$(ECHO) "Created '$(fardel_name)' archive in '$(prefix)'."
+       @$(ECHO) "Created '$(fardel_name)' archive in '$(fardel_root)'."
 
 # A native 'md5sum$(EXEEXT)' must be provided because lmi uses it for
 # run-time authentication.
@@ -1209,8 +1210,8 @@ wrap_fardel:
        @$(TAR) \
          --bzip2 \
          --create \
-         --directory=$(prefix) \
-         --file=$(prefix)/$(fardel_name).tar.bz2 \
+         --directory=$(fardel_root) \
+         --file=$(fardel_root)/$(fardel_name).tar.bz2 \
          $(fardel_name)
 
 
################################################################################