Skip to content

Commit 953b1d1

Browse files
committed
Don't use ${MFLAGS} with ${MAKE}
gmake starts complaining about this starting with 4.2.
1 parent d9cf426 commit 953b1d1

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

buildsys.mk.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ MO_FILES = ${LOCALES:.po=.mo}
114114

115115
all:
116116
${MAKE} pre-all
117-
${MAKE} ${MFLAGS} subdirs
118-
${MAKE} ${MFLAGS} depend
117+
${MAKE} subdirs
118+
${MAKE} depend
119119
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
120-
${MAKE} ${MFLAGS} subdirs-after
120+
${MAKE} subdirs-after
121121
${MAKE} post-all
122122

123123
pre-all post-all:
@@ -128,7 +128,7 @@ subdirs-after: ${SUBDIRS_AFTER}
128128
${SUBDIRS} ${SUBDIRS_AFTER}:
129129
for i in $@; do \
130130
${DIR_ENTER}; \
131-
${MAKE} ${MFLAGS} || exit $$?; \
131+
${MAKE} || exit $$?; \
132132
${DIR_LEAVE}; \
133133
done
134134

@@ -172,7 +172,7 @@ depend: pre-depend ${SRCS}
172172
done; \
173173
if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
174174
${DEPEND_STATUS}; \
175-
if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
175+
if ${MAKE} $$deps && cat $$deps >.deps; then \
176176
rm -f $$deps; \
177177
${DEPEND_OK}; \
178178
else \
@@ -623,7 +623,7 @@ locales: ${MO_FILES}
623623
install: all install-extra
624624
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
625625
${DIR_ENTER}; \
626-
${MAKE} ${MFLAGS} install || exit $$?; \
626+
${MAKE} install || exit $$?; \
627627
${DIR_LEAVE}; \
628628
done
629629

@@ -704,7 +704,7 @@ install-extra:
704704
uninstall: uninstall-extra
705705
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
706706
${DIR_ENTER}; \
707-
${MAKE} ${MFLAGS} uninstall || exit $$?; \
707+
${MAKE} uninstall || exit $$?; \
708708
${DIR_LEAVE}; \
709709
done
710710

@@ -797,7 +797,7 @@ uninstall-extra:
797797
clean:
798798
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
799799
${DIR_ENTER}; \
800-
${MAKE} ${MFLAGS} clean || exit $$?; \
800+
${MAKE} clean || exit $$?; \
801801
${DIR_LEAVE}; \
802802
done
803803

@@ -814,7 +814,7 @@ clean:
814814
distclean: clean
815815
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
816816
${DIR_ENTER}; \
817-
${MAKE} ${MFLAGS} distclean || exit $$?; \
817+
${MAKE} distclean || exit $$?; \
818818
${DIR_LEAVE}; \
819819
done
820820

@@ -832,7 +832,7 @@ print-hierarchy:
832832
for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
833833
echo ${PRINT_HIERARCHY_PREFIX}$$i; \
834834
cd $$i || exit $$?; \
835-
${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
835+
${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
836836
cd .. || exit $$?; \
837837
done
838838

0 commit comments

Comments
 (0)