Index: buildsys.mk.in ================================================================== --- buildsys.mk.in +++ buildsys.mk.in @@ -312,11 +312,11 @@ fi; \ for i in $$ars; do \ dir=".$$(echo $$i | sed 's/\//_/g').objs"; \ rm -fr $$dir; \ 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 \ i=Info.plist; \ ${INSTALL_STATUS}; \ if ${INSTALL} -m 644 $$i $$out/$$i; then \ ${INSTALL_OK}; \ @@ -850,14 +850,20 @@ ${MAKE} install || exit $$?; \ ${DIR_LEAVE}; \ done 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 \ test x"$$i" = x"" && continue; \ ${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}; \ else \ ${INSTALL_FAILED}; \ fi \ done; \