buildsys  Check-in [511e89e9c6]

Overview
Comment:Fix make install running several times
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 511e89e9c64727cd2beb346be11318407db23dd8dfca12f30cf54e834af635d9
User & Date: js on 2017-10-29 02:25:24
Other Links: manifest | tags
Context
2018-01-19
00:17
Use Apple libtool if build and host are Darwin check-in: 305b7c17e4 user: js tags: trunk
2017-10-29
02:25
Fix make install running several times check-in: 511e89e9c6 user: js tags: trunk
2017-10-24
22:07
Do not extract .a files to link them in check-in: 23fbb8c3ff user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified buildsys.mk.in from [879b10b864] to [628378e719].

︙
654
655
656
657
658
659
660
661

662
663
664
665
666
667
668

654
655
656
657
658
659
660

661
662
663
664
665
666
667
668








-
+








	out="$@"; \
	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} -x c -c -o $@ $<; then \
		${COMPILE_PLUGIN_OK}; \
	else \
		${COMPILE_PLUGIN_FAILED}; \
	fi

install: all install-includes install-extra
install: all install-extra
	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
		test x"$$i" = x"" && continue; \
		${DIR_ENTER}; \
		${MAKE} install || exit $$?; \
		${DIR_LEAVE}; \
	done
︙
711
712
713
714
715
716
717










718
719
720
721
722
723
724

711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734








+
+
+
+
+
+
+
+
+
+








		${INSTALL_STATUS}; \
		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
			${INSTALL_OK}; \
		else \
			${INSTALL_FAILED}; \
		fi \
	done

	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 \
			${INSTALL_OK}; \
		else \
			${INSTALL_FAILED}; \
		fi \
	done

	for i in "" ${MO_FILES}; do \
		test x"$$i" = x"" && continue; \
		${INSTALL_STATUS}; \
		if ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && ${INSTALL} -m 644 $$i ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
			${INSTALL_OK}; \
		else \
︙
736
737
738
739
740
741
742
743

744
745
746
747
748
749
750

746
747
748
749
750
751
752

753
754
755
756
757
758
759
760








-
+








		fi \
	done

install-includes:
	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
		test x"$$i" = x"" && continue; \
		${DIR_ENTER}; \
		${MAKE} install || exit $$?; \
		${MAKE} install-includes || 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 \
︙