Index: trunk/Ohana/src/opihi/Makefile
===================================================================
--- trunk/Ohana/src/opihi/Makefile	(revision 31450)
+++ trunk/Ohana/src/opihi/Makefile	(revision 31496)
@@ -23,30 +23,30 @@
 
 all:
-	for i in $(PROGRAM) $(SPECIAL); do make $$i || exit; done
-	make pantasks_client
-	make pantasks_server
+	for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i || exit; done
+	$(MAKE) pantasks_client
+	$(MAKE) pantasks_server
 
 libs:
-	for i in $(LIBS); do make $$i || exit; done
+	for i in $(LIBS); do $(MAKE) $$i || exit; done
 
 extras:
-	for i in $(EXTRAS); do make $$i || exit; done
+	for i in $(EXTRAS); do $(MAKE) $$i || exit; done
 
 install:
-	for i in $(PROGRAM) $(SPECIAL); do make $$i.install || exit; done
-	make pantasks_client.install
-	make pantasks_server.install
+	for i in $(PROGRAM) $(SPECIAL); do $(MAKE) $$i.install || exit; done
+	$(MAKE) pantasks_client.install
+	$(MAKE) pantasks_server.install
 
 extras-install:
-	for i in $(EXTRAS); do make $$i.install || exit; done
+	for i in $(EXTRAS); do $(MAKE) $$i.install || exit; done
 
 clean:
-	for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do make $$i.clean || exit; done
+	for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do $(MAKE) $$i.clean || exit; done
 
 libs-uninstall:
-	for i in $(LIBS); do make $$i.uninstall || exit; done
+	for i in $(LIBS); do $(MAKE) $$i.uninstall || exit; done
 
 dist: clean
-	for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do make $$i.dist || exit; done
+	for i in $(PROGRAM) $(SPECIAL) $(EXTRAS) $(LIBS); do $(MAKE) $$i.dist || exit; done
 	rm -rf bin
 	rm -rf lib
@@ -55,27 +55,27 @@
 
 pantasks_client pantasks_server:
-	if [ -d pantasks ]; then (cd pantasks && make $@); fi
+	if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
 pantasks_client.install: pantasks_client
-	if [ -d pantasks ]; then (cd pantasks && make $@); fi
+	if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
 pantasks_server.install: pantasks_server
-	if [ -d pantasks ]; then (cd pantasks && make $@); fi
+	if [ -d pantasks ]; then (cd pantasks && $(MAKE) $@); fi
 
 $(PROGRAM) $(LIBS) $(EXTRAS):
-	if [ -d "$@" ]; then (cd $@ && make); fi
+	if [ -d "$@" ]; then (cd $@ && $(MAKE)); fi
 
 %.install:
-	if [ -d "$*" ]; then make $*; fi
-	if [ -d "$*" ]; then (cd $* && make install); fi
+	if [ -d "$*" ]; then $(MAKE) $*; fi
+	if [ -d "$*" ]; then (cd $* && $(MAKE) install); fi
 
 %.clean:
-	if [ -d "$*" ]; then (cd $* && make clean); fi
+	if [ -d "$*" ]; then (cd $* && $(MAKE) clean); fi
 
 %.dist:
-	if [ -d "$*" ]; then (cd $* && make dist); fi
+	if [ -d "$*" ]; then (cd $* && $(MAKE) dist); fi
 
 %.uninstall:
-	if [ -d "$*" ]; then (cd $* && make uninstall); fi
+	if [ -d "$*" ]; then (cd $* && $(MAKE) uninstall); fi
 
 .PHONY: $(PROGRAM) $(LIBS) pantasks_server pantasks_client