Skip to content

Commit 932a1fc

Browse files
MidarMidar
committed
Make sure we never end up with "for i in ;"
DJGPP's bash.exe bails out on this.
1 parent a428873 commit 932a1fc

1 file changed

Lines changed: 51 additions & 25 deletions

File tree

‎buildsys.mk.in‎

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016
2+
# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
3+
# 2017
34
# Jonathan Schleifer <js@heap.zone>
45
#
56
# https://heap.zone/git/?p=buildsys.git
@@ -136,8 +137,10 @@ depend: pre-depend ${SRCS}
136137
regen=0; \
137138
deps=""; \
138139
test -f .deps || regen=1; \
139-
for i in ${SRCS}; do \
140+
for i in "" ${SRCS}; do \
140141
case $$i in \
142+
"") \
143+
;; \
141144
*.c) \
142145
if test x"${CC_DEPENDS}" = x"yes"; then \
143146
test $$i -nt .deps && regen=1; \
@@ -621,13 +624,15 @@ locales: ${MO_FILES}
621624
fi
622625

623626
install: all install-extra
624-
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
627+
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
628+
test x"$$i" = x"" && continue; \
625629
${DIR_ENTER}; \
626630
${MAKE} install || exit $$?; \
627631
${DIR_LEAVE}; \
628632
done
629633

630-
for i in ${SHARED_LIB}; do \
634+
for i in "" ${SHARED_LIB}; do \
635+
test x"$$i" = x"" && continue; \
631636
${INSTALL_STATUS}; \
632637
if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \
633638
${INSTALL_OK}; \
@@ -636,7 +641,8 @@ install: all install-extra
636641
fi \
637642
done
638643

639-
for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
644+
for i in "" ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
645+
test x"$$i" = x"" && continue; \
640646
${INSTALL_STATUS}; \
641647
if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
642648
${INSTALL_OK}; \
@@ -645,7 +651,8 @@ install: all install-extra
645651
fi \
646652
done
647653

648-
for i in ${PLUGIN}; do \
654+
for i in "" ${PLUGIN}; do \
655+
test x"$$i" = x"" && continue; \
649656
${INSTALL_STATUS}; \
650657
if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
651658
${INSTALL_OK}; \
@@ -654,7 +661,8 @@ install: all install-extra
654661
fi \
655662
done
656663

657-
for i in ${DATA}; do \
664+
for i in "" ${DATA}; do \
665+
test x"$$i" = x"" && continue; \
658666
${INSTALL_STATUS}; \
659667
if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
660668
${INSTALL_OK}; \
@@ -663,7 +671,8 @@ install: all install-extra
663671
fi \
664672
done
665673

666-
for i in ${PROG}; do \
674+
for i in "" ${PROG}; do \
675+
test x"$$i" = x"" && continue; \
667676
${INSTALL_STATUS}; \
668677
if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
669678
${INSTALL_OK}; \
@@ -672,7 +681,8 @@ install: all install-extra
672681
fi \
673682
done
674683

675-
for i in ${INCLUDES}; do \
684+
for i in "" ${INCLUDES}; do \
685+
test x"$$i" = x"" && continue; \
676686
${INSTALL_STATUS}; \
677687
if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
678688
${INSTALL_OK}; \
@@ -681,7 +691,8 @@ install: all install-extra
681691
fi \
682692
done
683693

684-
for i in ${MO_FILES}; do \
694+
for i in "" ${MO_FILES}; do \
695+
test x"$$i" = x"" && continue; \
685696
${INSTALL_STATUS}; \
686697
if ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && ${INSTALL} -m 644 $$i ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
687698
${INSTALL_OK}; \
@@ -690,7 +701,8 @@ install: all install-extra
690701
fi \
691702
done
692703

693-
for i in ${MAN}; do \
704+
for i in "" ${MAN}; do \
705+
test x"$$i" = x"" && continue; \
694706
${INSTALL_STATUS}; \
695707
if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
696708
${INSTALL_OK}; \
@@ -702,13 +714,15 @@ install: all install-extra
702714
install-extra:
703715

704716
uninstall: uninstall-extra
705-
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
717+
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
718+
test x"$$i" = x"" && continue; \
706719
${DIR_ENTER}; \
707720
${MAKE} uninstall || exit $$?; \
708721
${DIR_LEAVE}; \
709722
done
710723

711-
for i in ${SHARED_LIB}; do \
724+
for i in "" ${SHARED_LIB}; do \
725+
test x"$$i" = x"" && continue; \
712726
if test -f ${DESTDIR}${libdir}/$$i; then \
713727
if : ${UNINSTALL_LIB}; then \
714728
${DELETE_OK}; \
@@ -718,7 +732,8 @@ uninstall: uninstall-extra
718732
fi; \
719733
done
720734

721-
for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
735+
for i in "" ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
736+
test x"$$i" = x"" && continue; \
722737
if test -f ${DESTDIR}${libdir}/$$i; then \
723738
if rm -f ${DESTDIR}${libdir}/$$i; then \
724739
${DELETE_OK}; \
@@ -728,7 +743,8 @@ uninstall: uninstall-extra
728743
fi \
729744
done
730745

731-
for i in ${PLUGIN}; do \
746+
for i in "" ${PLUGIN}; do \
747+
test x"$$i" = x"" && continue; \
732748
if test -f ${DESTDIR}${plugindir}/$$i; then \
733749
if rm -f ${DESTDIR}${plugindir}/$$i; then \
734750
${DELETE_OK}; \
@@ -739,7 +755,8 @@ uninstall: uninstall-extra
739755
done
740756
-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
741757

742-
for i in ${DATA}; do \
758+
for i in "" ${DATA}; do \
759+
test x"$$i" = x"" && continue; \
743760
if test -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
744761
if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
745762
${DELETE_OK}; \
@@ -751,7 +768,8 @@ uninstall: uninstall-extra
751768
done
752769
-rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1
753770

754-
for i in ${PROG}; do \
771+
for i in "" ${PROG}; do \
772+
test x"$$i" = x"" && continue; \
755773
if test -f ${DESTDIR}${bindir}/$$i; then \
756774
if rm -f ${DESTDIR}${bindir}/$$i; then \
757775
${DELETE_OK}; \
@@ -761,7 +779,8 @@ uninstall: uninstall-extra
761779
fi \
762780
done
763781

764-
for i in ${INCLUDES}; do \
782+
for i in "" ${INCLUDES}; do \
783+
test x"$$i" = x"" && continue; \
765784
if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
766785
if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
767786
${DELETE_OK}; \
@@ -772,7 +791,8 @@ uninstall: uninstall-extra
772791
done
773792
-rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1
774793

775-
for i in ${MO_FILES}; do \
794+
for i in "" ${MO_FILES}; do \
795+
test x"$$i" = x"" && continue; \
776796
if test -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
777797
if rm -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
778798
${DELETE_OK}; \
@@ -782,7 +802,8 @@ uninstall: uninstall-extra
782802
fi \
783803
done
784804

785-
for i in ${MAN}; do \
805+
for i in "" ${MAN}; do \
806+
test x"$$i" = x"" && continue; \
786807
if test -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
787808
if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
788809
${DELETE_OK}; \
@@ -795,13 +816,15 @@ uninstall: uninstall-extra
795816
uninstall-extra:
796817

797818
clean:
798-
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
819+
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
820+
test x"$$i" = x"" && continue; \
799821
${DIR_ENTER}; \
800822
${MAKE} clean || exit $$?; \
801823
${DIR_LEAVE}; \
802824
done
803825

804-
for i in ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
826+
for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
827+
test x"$$i" = x"" && continue; \
805828
if test -f $$i -o -d $$i; then \
806829
if rm -fr $$i; then \
807830
${DELETE_OK}; \
@@ -812,13 +835,15 @@ clean:
812835
done
813836

814837
distclean: clean
815-
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
838+
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
839+
test x"$$i" = x"" && continue; \
816840
${DIR_ENTER}; \
817841
${MAKE} distclean || exit $$?; \
818842
${DIR_LEAVE}; \
819843
done
820844

821-
for i in ${DISTCLEAN} .deps *~; do \
845+
for i in "" ${DISTCLEAN} .deps *~; do \
846+
test x"$$i" = x"" && continue; \
822847
if test -f $$i -o -d $$i; then \
823848
if rm -fr $$i; then \
824849
${DELETE_OK}; \
@@ -829,7 +854,8 @@ distclean: clean
829854
done
830855

831856
print-hierarchy:
832-
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
857+
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
858+
test x"$$i" = x"" && continue; \
833859
echo ${PRINT_HIERARCHY_PREFIX}$$i; \
834860
cd $$i || exit $$?; \
835861
${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \

0 commit comments

Comments
 (0)