js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix copying .framework headers into wrong dir

Browse source
This commit is contained in:
Jonathan Schleifer 2017-10-17 00:48:01 +02:00
parent fcd2b51d19
commit d7a5ac12cd
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
buildsys.mk.in
View file

@ -314,7 +314,7 @@ ${FRAMEWORK}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
rm -fr $$dir; \ rm -fr $$dir; \
done; \ done; \
${MAKE} includedir=$$PWD/$$out/Headers INSTALL_INCLUDES_IF_SUBDIR=${includesubdir} install-includes; \ ${MAKE} INSTALL_INCLUDES_IF_SUBDIR=${includesubdir} INSTALL_INCLUDES_DESTINATION=$$PWD/$$out/Headers install-includes; \
if test -f Info.plist; then \ if test -f Info.plist; then \
i=Info.plist; \ i=Info.plist; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
@ -852,10 +852,16 @@ install-includes:
done done
if test x"${INSTALL_INCLUDES_IF_SUBDIR}" = x"" -o x"${includesubdir}" = x"${INSTALL_INCLUDES_IF_SUBDIR}"; then \ if test x"${INSTALL_INCLUDES_IF_SUBDIR}" = x"" -o x"${includesubdir}" = x"${INSTALL_INCLUDES_IF_SUBDIR}"; then \
if test x"${INSTALL_INCLUDES_DESTINATION}" != x""; then \
destination="${INSTALL_INCLUDES_DESTINATION}"; \
else \
destination="${DESTDIR}${includedir}/${includesubdir}"; \
fi; \
\
for i in "" ${INCLUDES}; do \ for i in "" ${INCLUDES}; do \
test x"$$i" = x"" && continue; \ test x"$$i" = x"" && continue; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ if ${MKDIR_P} $$destination && ${INSTALL} -m 644 $$i $$destination/$$i; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
else \ else \
${INSTALL_FAILED}; \ ${INSTALL_FAILED}; \