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

fixed typo in optional variable-expansion

parent 5b123add
...@@ -28,13 +28,13 @@ variables: ...@@ -28,13 +28,13 @@ variables:
## build snippets ## build snippets
.script:make: &script_make .script:make: &script_make
- make -C "${SRCDIR}" ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:=PLATFORM=}${TARGETARCH} - make -C "${SRCDIR}" ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH}
.script:make_check: &script_make_check .script:make_check: &script_make_check
# the 'make --version' invocation is used to detect cross-compilation # the 'make --version' invocation is used to detect cross-compilation
- 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...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...skipping"; fi
.script:make_install: &script_make_install .script:make_install: &script_make_install
- rm -rf "${IEM_CI_PKGLIBDIR}" - rm -rf "${IEM_CI_PKGLIBDIR}"
- make -C "${SRCDIR}" install ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:=PLATFORM=}${TARGETARCH} DESTDIR="$(pwd)" pkglibdir="/${IEM_CI_PKGLIBDIR}/" - make -C "${SRCDIR}" install ${pd_extension:+extension=}${pd_extension} ${TARGETARCH:+PLATFORM=}${TARGETARCH} DESTDIR="$(pwd)" pkglibdir="/${IEM_CI_PKGLIBDIR}/"
- rm -rf "${CI_PROJECT_NAME}" - rm -rf "${CI_PROJECT_NAME}"
- mv "${IEM_CI_PKGLIBDIR}/${CI_PROJECT_NAME}" . - mv "${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