Commit 6c1f706ba4555e3ca48dd34f6e77a27237d5b9c2
1 parent
59421629
Exists in
master
and in
5 other branches
Refactoring windows package build script.
Showing
1 changed file
with
5 additions
and
2 deletions
Show diff stats
win/pack.sh
... | ... | @@ -210,7 +210,6 @@ buildApplication() |
210 | 210 | mkdir -p ${WORKDIR}/build/${ARCH} |
211 | 211 | mkdir -p ${WORKDIR}/cache/${ARCH} |
212 | 212 | mkdir -p ${WORKDIR}/build/${ARCH}/bin |
213 | - mkdir -p ${WORKDIR}/build/${ARCH}/lib | |
214 | 213 | mkdir -p ${WORKDIR}/build/${ARCH}/locale |
215 | 214 | mkdir -p ${WORKDIR}/build/${ARCH}/include |
216 | 215 | mkdir -p ${WORKDIR}/build/${ARCH}/sysconfig |
... | ... | @@ -227,7 +226,7 @@ buildApplication() |
227 | 226 | --host=${host} \ |
228 | 227 | --prefix=${prefix} \ |
229 | 228 | --bindir=${WORKDIR}/build/${ARCH}/bin \ |
230 | - --libdir=${WORKDIR}/build/${ARCH}/lib \ | |
229 | + --libdir=${WORKDIR}/build/${ARCH}/bin \ | |
231 | 230 | --localedir=${WORKDIR}/build/${ARCH}/locale \ |
232 | 231 | --includedir=${WORKDIR}/build/${ARCH}/include \ |
233 | 232 | --sysconfdir=${WORKDIR}/build/${ARCH}/sysconfig \ |
... | ... | @@ -248,6 +247,10 @@ buildApplication() |
248 | 247 | failed "Can't install ${1}" |
249 | 248 | fi |
250 | 249 | |
250 | + if [ -e ./win/${1}.nsi ]; then | |
251 | + cp "./win/${1}.nsi" "${WORKDIR}/build/${ARCH}" | |
252 | + fi | |
253 | + | |
251 | 254 | done |
252 | 255 | |
253 | 256 | ... | ... |