diff --git a/ChangeLog b/ChangeLog index 36b948db2..afbe35e61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-08-25 Juli Mallett + + * makefile: Fix recursive invocation of make(1) to use + the variable MAKE, to use the same utility that was + responsible for the invocation of the initial build. + 2002-08-25 Miguel de Icaza * gtk/TextBuffer.custom: Added SetText with a single argumnet. diff --git a/makefile b/makefile index 2849cdb26..5aa23019a 100644 --- a/makefile +++ b/makefile @@ -9,7 +9,7 @@ all: linux windows: for i in $(DIRS); do \ - CSC=$(CSC) make -C $$i windows || exit 1; \ + CSC=$(CSC) $(MAKE) -C $$i windows || exit 1; \ done; unix: @@ -19,22 +19,22 @@ linux: native binding binding: for i in $(DIRS); do \ - MCS="$(MCS)" make -C $$i || exit 1;\ + MCS="$(MCS)" $(MAKE) -C $$i || exit 1;\ done; native: for i in $(NATIVE_DIRS); do \ - make -C $$i || exit 1; \ + $(MAKE) -C $$i || exit 1; \ done clean: for i in $(NATIVE_DIRS) $(DIRS); do \ - make -C $$i clean || exit 1; \ + $(MAKE) -C $$i clean || exit 1; \ done; distclean: clean for i in $(NATIVE_DIRS); do \ - make -C $$i distclean || exit 1; \ + $(MAKE) -C $$i distclean || exit 1; \ done for i in $(DIRS); do \ rm -f $$i/Makefile; \ @@ -50,10 +50,10 @@ install: install-native install-binding install-binding: for i in $(DIRS); do \ - make -C $$i install || exit 1; \ + $(MAKE) -C $$i install || exit 1; \ done install-native: for i in $(NATIVE_DIRS); do \ - make -C $$i install || exit 1; \ + $(MAKE) -C $$i install || exit 1; \ done