Index: trunk/Ohana/Makefile
===================================================================
--- trunk/Ohana/Makefile	(revision 2498)
+++ trunk/Ohana/Makefile	(revision 2510)
@@ -17,38 +17,35 @@
 # readline.  Extra care should be taken in compiling those libraries. 
 
+# Edit Configure to reflect the location of your installation (or use ./configure)
+include Configure
+
 # .SILENT:								       
 default: all
 
-# Edit Configure to reflect the location of your installation
-include Configure
-
-# ARCH is used to isolate binaries from different architectures
-# warning: this is a gnu-make specific syntax
-ARCH = $(shell getarch)
-
 # The collection of Ohana programs.  Other components in the src
 # directory may be compiled by going to those directories. 
-PROGRAM = \
-addrefs    \
-addspphot  \
-addstar    \
-delstar    \
-elixir     \
-gastro     \
-gastro2    \
-gcompare   \
-gophot     \
-imclean    \
-imregister \
-kapa       \
-kii        \
-misc       \
+PROGRAM =   \
+addrefs     \
+addspphot   \
+addstar     \
+delstar     \
+elixir      \
+gastro      \
+gastro2     \
+gcompare    \
+gophot      \
+imclean     \
+imregister  \
+kapa        \
+kii         \
+misc        \
 mosastro.v2 \
-nightd     \
-perl       \
-photdbc    \
-relphot    \
-shell      \
-tcl        \
+nightd      \
+opihi.v2    \
+perl        \
+photdbc     \
+relphot     \
+shell       \
+tcl         \
 uniphot
 
@@ -63,10 +60,11 @@
 
 # Required libraries depends on the architecture
-LIBS-linux = libohana libfits libdummy
-LIBS-lin64 = libohana libfits libdummy
+LIBS-linux = libfits libohana libdummy
+LIBS-lin64 = libfits libohana libdummy
 
 # general build targets:
 libs:
-	mkdir -p lib/$(ARCH)
+	mkdir -p $(LINC)
+	mkdir -p $(LLIB)
 	for i in $(LIBS-$(ARCH)); do make $$i.install; done