Index: branches/eam_branches/ipp-20110505/Ohana/Makefile.in
===================================================================
--- branches/eam_branches/ipp-20110505/Ohana/Makefile.in	(revision 31458)
+++ branches/eam_branches/ipp-20110505/Ohana/Makefile.in	(revision 31615)
@@ -76,39 +76,39 @@
 	mkdir -p $(DESTLIB)
 	mkdir -p $(DESTBIN)
-	for i in $(LIBS); do make $$i.install || exit 1; done
+	for i in $(LIBS); do $(MAKE) $$i.install || exit 1; done
 	chmod +x ohana-config
 	cp -f ohana-config $(DESTBIN)/
 
 bins: 
-	for i in $(PROGRAM); do make $$i; done
+	for i in $(PROGRAM); do $(MAKE) $$i; done
 
 all:
-	make libs || exit 1
-	for i in $(PROGRAM); do make $$i || exit 1; done
+	$(MAKE) libs || exit 1
+	for i in $(PROGRAM); do $(MAKE) $$i || exit 1; done
 
 extras:
-	for i in $(EXTRAS); do make $$i || exit 1; done
+	for i in $(EXTRAS); do $(MAKE) $$i || exit 1; done
 
 pantasks:
-	make libs || exit 1
-	cd src/opihi; make pclient.install && exit 1
-	cd src/opihi; make pcontrol.install && exit 1
-	cd src/opihi; make pantasks.install && exit 1
+	$(MAKE) libs || exit 1
+	cd src/opihi; $(MAKE) pclient.install && exit 1
+	cd src/opihi; $(MAKE) pcontrol.install && exit 1
+	cd src/opihi; $(MAKE) pantasks.install && exit 1
 
 mana:
-	make libs
-	make kapa2.install
-	cd src/opihi; make mana.install && exit 1
+	$(MAKE) libs
+	$(MAKE) kapa2.install
+	cd src/opihi; $(MAKE) mana.install && exit 1
 
 dvoshell:
-	make libs
-	make kapa2.install
-	cd src/opihi; make dvo.install && exit 1
+	$(MAKE) libs
+	$(MAKE) kapa2.install
+	cd src/opihi; $(MAKE) dvo.install && exit 1
 
 clean:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	for i in $(LIBS); do make $$i.clean || exit 1; done
-	for i in $(PROGRAM); do make $$i.clean || exit 1; done
-	for i in $(EXTRAS); do make $$i.clean || exit 1; done
+	for i in $(LIBS); do $(MAKE) $$i.clean || exit 1; done
+	for i in $(PROGRAM); do $(MAKE) $$i.clean || exit 1; done
+	for i in $(EXTRAS); do $(MAKE) $$i.clean || exit 1; done
 	@rm -f `find . -name .mana`
 	@rm -f `find . -name .dvo`
@@ -117,16 +117,16 @@
 dist:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	for i in $(LIBS); do make $$i.dist || exit 1; done
-	for i in $(PROGRAM); do make $$i.dist || exit 1; done
+	for i in $(LIBS); do $(MAKE) $$i.dist || exit 1; done
+	for i in $(PROGRAM); do $(MAKE) $$i.dist || exit 1; done
 	@echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
 
 install:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
-	for i in $(LIBS); do make $$i.install || exit 1; done
-	for i in $(PROGRAM); do make $$i.install || exit 1; done
+	for i in $(LIBS); do $(MAKE) $$i.install || exit 1; done
+	for i in $(PROGRAM); do $(MAKE) $$i.install || exit 1; done
 	@echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
 
 install.extras:
-	for i in $(EXTRAS); do make $$i.install || exit 1; done
+	for i in $(EXTRAS); do $(MAKE) $$i.install || exit 1; done
 	@echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
 
@@ -135,5 +135,5 @@
 	@if [ -d "src/$@" ]; then \
 	  echo -n -e "\0033]0; *** Ohana: $@ *** \0007"; \
-	  (cd src/$@ && make); \
+	  (cd src/$@ && $(MAKE)); \
 	fi
 	@echo -n -e "\0033]0; *** Ohana: done $@ *** \0007" \
@@ -142,9 +142,9 @@
 	@echo -n -e "\0033]0; *** Ohana: $@ *** \0007" \
 	mkdir -p bin/$(ARCH)
-	if [ -d "src/$*" ]; then (cd src/$* && make install); fi
+	if [ -d "src/$*" ]; then (cd src/$* && $(MAKE) install); fi
 
 %.clean:
-	if [ -d "src/$*" ]; then (cd src/$* && make clean); fi
+	if [ -d "src/$*" ]; then (cd src/$* && $(MAKE) clean); fi
 
 %.dist:
-	(cd src/$* && make dist)
+	(cd src/$* && $(MAKE) dist)