buildsys  Check-in [cea80baf39]

Overview
Comment:Fix copying .framework headers into wrong dir
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: cea80baf39d09e8052c4084b0f9e58669284946265f3d3786e96746e6c68d239
User & Date: js on 2017-10-16 22:48:01
Other Links: manifest | tags
Context
2017-10-19
20:54
Add support for building iOS frameworks check-in: 53b768c617 user: js tags: trunk
2017-10-16
22:48
Fix copying .framework headers into wrong dir check-in: cea80baf39 user: js tags: trunk
2017-10-15
20:50
Use module.modulemap instead of module.map check-in: b4d7f6b2a0 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified buildsys.mk.in from [52e0238951] to [98d996be7a].

︙
310
311
312
313
314
315
316
317

318
319
320
321
322
323
324

310
311
312
313
314
315
316

317
318
319
320
321
322
323
324








-
+








		rm -fr $$out; \
		${LINK_FAILED}; \
	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}; \
		else \
			${INSTALL_FAILED}; \
︙
848
849
850
851
852
853
854






855
856
857
858

859
860
861
862
863
864
865

848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863

864
865
866
867
868
869
870
871








+
+
+
+
+
+



-
+








		test x"$$i" = x"" && continue; \
		${DIR_ENTER}; \
		${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; \
	fi
︙