Commit a4d26c71 authored by IOhannes m zmölnig's avatar IOhannes m zmölnig
Browse files

fixed install-path calculation

parent cf530002
...@@ -38,7 +38,7 @@ variables: ...@@ -38,7 +38,7 @@ variables:
- if make --version | egrep $(echo ${TARGETARCH:-$(${CC:-cc} -dumpmachine)} | sed -e 's|-.*-|-.*-|') && make -C "${SRCDIR}" check -n ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} >/dev/null 2>&1 ; then make -C "${SRCDIR}" check ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH}; else echo "no 'check' target or cross-compiling...skipping"; fi - if make --version | egrep $(echo ${TARGETARCH:-$(${CC:-cc} -dumpmachine)} | sed -e 's|-.*-|-.*-|') && make -C "${SRCDIR}" check -n ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} >/dev/null 2>&1 ; then make -C "${SRCDIR}" check ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH}; else echo "no 'check' target or cross-compiling...skipping"; fi
.script:make_install: &script_make_install .script:make_install: &script_make_install
- rm -rf "${IEM_CI_TMPDIR}" - rm -rf "${IEM_CI_TMPDIR}"
- make -C "${SRCDIR}" install ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} DESTDIR="$(pwd)" pkglibdir="/${IEM_CI_TMPDIR}/${IEM_CI_PKGLIBDIR:${IEM_CI_PKGLIBDIR}/${CI_JOB_NAME}/}" - make -C "${SRCDIR}" install ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} DESTDIR="$(pwd)" pkglibdir="/${IEM_CI_TMPDIR}/${IEM_CI_PKGLIBDIR}${IEM_CI_PKGLIBDIR:+/${CI_JOB_NAME}/}"
- rm -rf "${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}" - rm -rf "${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}"
- mv "${IEM_CI_TMPDIR}/${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}" . - mv "${IEM_CI_TMPDIR}/${IEM_CI_PKGLIBDIR:-${CI_PROJECT_NAME}}" .
......
Supports Markdown
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