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

Fix make install running several times

Browse source
This commit is contained in:
Jonathan Schleifer 2017-10-29 03:25:24 +01:00
parent 2f5e82f4a5
commit d49633ffc4
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
buildsys.mk.in
View file

@ -658,7 +658,7 @@ locales: ${MO_FILES}
${COMPILE_PLUGIN_FAILED}; \ ${COMPILE_PLUGIN_FAILED}; \
fi fi
install: all install-includes install-extra install: all install-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \ test x"$$i" = x"" && continue; \
${DIR_ENTER}; \ ${DIR_ENTER}; \
@ -716,6 +716,16 @@ install: all install-includes install-extra
fi \ fi \
done 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 \ for i in "" ${MO_FILES}; do \
test x"$$i" = x"" && continue; \ test x"$$i" = x"" && continue; \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
@ -740,7 +750,7 @@ install-includes:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \ for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \ test x"$$i" = x"" && continue; \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} install || exit $$?; \ ${MAKE} install-includes || exit $$?; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done