aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-08 00:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

makefile: honor DESTDIR flag.

Browse Source 
1. Fix config installation not exec permission is needed.

2. Makefile install all in DESTDIR.

make install DESTDIR=/tmp/dest/

Before:
$tree /tmp/dest/
/tmp/dest/
└── usr
    ├── bin
    │   └── kata-collect-data.sh
    └── share
        └── defaults
            └── kata-containers
                └── configuration.toml

5 directories, 2 files

Now:
$tree /tmp/dest/
/tmp/dest/
└── usr
    ├── local
    │   └── bin
    │       ├── kata-collect-data.sh
    │       └── kata-runtime
    └── share
        ├── bash-completion
        │   └── completions
        │       └── kata-runtime
        └── defaults
            └── kata-containers
                └── configuration.toml

Fixes: #401

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz
2018-06-14 17:59:38 -05:00
parent ea6eed47d7
commit 39bc5ab3ee
2 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/kata-collect-data.sh.in
View File

@@ -180,8 +180,8 @@ show_runtime_configs()
# add in the standard defaults for good measure "just in case"
configs+=" /etc/@PROJECT_TAG@/configuration.toml"
configs+=" /usr/share/defaults/@PROJECT_TAG@/configuration.toml"
configs+=" @DESTCONFIG@"
configs+=" @DESTSYSCONFIG@"
configs+=" @CONFIG_PATH@"
configs+=" @SYSCONFIG@"
# create a unique list of config files
configs=$(echo $configs|tr ' ' '\n'|sort -u)