Index: /trunk/Ohana/Makefile.in
===================================================================
--- /trunk/Ohana/Makefile.in	(revision 31495)
+++ /trunk/Ohana/Makefile.in	(revision 31496)
@@ -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)
Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 31495)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 31496)
@@ -267,6 +267,6 @@
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(INSTALL); do make $$i.install || exit; done
+	for i in $(INSTALL); do $(MAKE) $$i.install || exit; done
Index: /trunk/Ohana/src/dvomerge/Makefile
===================================================================
--- /trunk/Ohana/src/dvomerge/Makefile	(revision 31495)
+++ /trunk/Ohana/src/dvomerge/Makefile	(revision 31496)
@@ -108,6 +108,6 @@
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(INSTALL); do make $$i.install || exit; done
+	for i in $(INSTALL); do $(MAKE) $$i.install || exit; done
Index: /trunk/Ohana/src/dvosplit/Makefile
===================================================================
--- /trunk/Ohana/src/dvosplit/Makefile	(revision 31495)
+++ /trunk/Ohana/src/dvosplit/Makefile	(revision 31496)
@@ -43,6 +43,6 @@
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(INSTALL); do make $$i.install || exit; done
+	for i in $(INSTALL); do $(MAKE) $$i.install || exit; done
Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 31495)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 31496)
@@ -185,9 +185,9 @@
 %.rebuild :
 	rm -f $(BIN)/$*.$(ARCH)
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(INSTALL); do make $$i.install || exit; done
+	for i in $(INSTALL); do $(MAKE) $$i.install || exit; done
Index: /trunk/Ohana/src/libdvo/Makefile
===================================================================
--- /trunk/Ohana/src/libdvo/Makefile	(revision 31495)
+++ /trunk/Ohana/src/libdvo/Makefile	(revision 31496)
@@ -101,21 +101,21 @@
 
 $(AINC)/autocode.h: $(AINCS) $(ADEF)/autocode.h $(ADEF)/common.h
-	@echo "make $@ from $^"
-	cd $(AUTO) && make $@
+	@echo "$(MAKE) $@ from $^"
+	cd $(AUTO) && $(MAKE) $@
 
 # generic rule for AINCS
 $(AINC)/%.h : $(ADEF)/%.d $(ADEF)/autocode.h $(ADEF)/common.h
-	@echo "make $@ from $^"
-	cd $(AUTO) && make $@
+	@echo "$(MAKE) $@ from $^"
+	cd $(AUTO) && $(MAKE) $@
 
 # generic rule for ASRC
 $(ASRC)/%.c : $(ADEF)/%.d $(ADEF)/autocode.c $(AINC)/%.h
-	@echo "make $@ from $^"
-	cd $(AUTO) && make $@
+	@echo "$(MAKE) $@ from $^"
+	cd $(AUTO) && $(MAKE) $@
 
 # generic rule for AOBJS
 $(ASRC)/%.$(ARCH).o : $(ASRC)/%.c
-	@echo "make $@ from $^"
-	cd $(AUTO) && make $@
+	@echo "$(MAKE) $@ from $^"
+	cd $(AUTO) && $(MAKE) $@
 
 tabletest: install
@@ -124,5 +124,5 @@
 clean: cleandef
 cleandef:
-	cd $(AUTO) && make clean
+	cd $(AUTO) && $(MAKE) clean
 
 .PRECIOUS: $(ASRC)/%.c
Index: /trunk/Ohana/src/libohana/Makefile
===================================================================
--- /trunk/Ohana/src/libohana/Makefile	(revision 31495)
+++ /trunk/Ohana/src/libohana/Makefile	(revision 31496)
@@ -54,5 +54,5 @@
 testcode: install $(TEST)
 test:
-	make testcode
+	$(MAKE) testcode
 	for i in $(TEST); do $$i; done
 
Index: /trunk/Ohana/src/misc/Makefile
===================================================================
--- /trunk/Ohana/src/misc/Makefile	(revision 31495)
+++ /trunk/Ohana/src/misc/Makefile	(revision 31496)
@@ -37,5 +37,5 @@
 
 cfhtlog:
-	make $(DESTBIN)/cfhtlog
+	$(MAKE) $(DESTBIN)/cfhtlog
 
 # copied from Makefile.Common : use a single c file: foo : foo.c
@@ -56,8 +56,8 @@
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(PROGRAMS); do make $$i.install || exit; done
+	for i in $(PROGRAMS); do $(MAKE) $$i.install || exit; done
 
 %.clean:
Index: /trunk/Ohana/src/opihi/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/Makefile	(revision 31495)
+++ /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
Index: /trunk/Ohana/src/skycalc/Makefile
===================================================================
--- /trunk/Ohana/src/skycalc/Makefile	(revision 31495)
+++ /trunk/Ohana/src/skycalc/Makefile	(revision 31496)
@@ -75,6 +75,6 @@
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(INSTALL); do make $$i.install || exit; done
+	for i in $(INSTALL); do $(MAKE) $$i.install || exit; done
Index: /trunk/Ohana/src/tools/Makefile
===================================================================
--- /trunk/Ohana/src/tools/Makefile	(revision 31495)
+++ /trunk/Ohana/src/tools/Makefile	(revision 31496)
@@ -57,8 +57,8 @@
 
 %.install:
-	make $(DESTBIN)/$*
+	$(MAKE) $(DESTBIN)/$*
 
 install:
-	for i in $(PROGRAMS); do make $$i.install || exit; done
+	for i in $(PROGRAMS); do $(MAKE) $$i.install || exit; done