Skip to content
Snippets Groups Projects
Commit 450da191 authored by Jenkins2's avatar Jenkins2 Committed by Gerrit Code Review
Browse files

Merge "BuildSystem: Invoke install not in GNU but POSIX style."

parents 3fd96ec9 4cd3f5c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build_tools/download_externals
+ 2
− 2
View file @ 450da191
...@@ -214,7 +214,7 @@ trap "rm -rf ${cache_dir}/${module_dir} ; rm -rf ${tmpdir}" EXIT ...@@ -214,7 +214,7 @@ trap "rm -rf ${cache_dir}/${module_dir} ; rm -rf ${tmpdir}" EXIT
echo "${full_name}: Installing." echo "${full_name}: Installing."
if [[ $EUID == 0 ]] ; then if [[ $EUID == 0 ]] ; then
install_params="--group=0 --owner=0" install_params="-g 0 -o 0"
fi fi
names=$(${XMLSTARLET} sel -t -m "//file" -v "@name" -n ${cache_dir}/${module_dir}/manifest.xml) names=$(${XMLSTARLET} sel -t -m "//file" -v "@name" -n ${cache_dir}/${module_dir}/manifest.xml)
...@@ -229,7 +229,7 @@ for name in ${names} ; do ...@@ -229,7 +229,7 @@ for name in ${names} ; do
mode=0644 mode=0644
fi fi
${INSTALL} -Dp ${install_params} --mode=${mode} ${source_path} ${install_path} ${INSTALL} -Dp ${install_params} -m ${mode} ${source_path} ${install_path}
done done
${INSTALL} -Dp ${install_params} --mode=0644 ${cache_dir}/${module_dir}/manifest.xml ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml ${INSTALL} -Dp ${install_params} --mode=0644 ${cache_dir}/${module_dir}/manifest.xml ${DESTDIR}${ASTMODDIR}/${module_name}.manifest.xml
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment