Index: /trunk/Ohana/Configure.in
===================================================================
--- /trunk/Ohana/Configure.in	(revision 6705)
+++ /trunk/Ohana/Configure.in	(revision 6706)
@@ -34,3 +34,4 @@
 RANLIB-linux = ranlib
 RANLIB-lin64 = ranlib
+RANLIB-linrh = ranlib
 RANLIB = $(RANLIB-$(ARCH))
Index: /trunk/Ohana/Makefile
===================================================================
--- /trunk/Ohana/Makefile	(revision 6705)
+++ /trunk/Ohana/Makefile	(revision 6706)
@@ -71,4 +71,5 @@
 LIBS-linux = libohana libfits libdvo libkapa libdummy
 LIBS-lin64 = libohana libfits libdvo libkapa libdummy
+LIBS-linrh = libohana libfits libdvo libkapa libdummy
 LIBS-sid   = libohana libfits libdvo libkapa libdummy
 LIBS-sol   = libohana libfits libdvo libkapa 
Index: /trunk/Ohana/src/elixir/src/MachineOps.c
===================================================================
--- /trunk/Ohana/src/elixir/src/MachineOps.c	(revision 6705)
+++ /trunk/Ohana/src/elixir/src/MachineOps.c	(revision 6706)
@@ -410,5 +410,5 @@
 
   fprintf (stderr, "can't find this machine, process combination!\n");
-  fprintf (stderr, "machine: %lx, process: %lx\n", (size_t) machine, (size_t) process);
+  fprintf (stderr, "machine: %p process: %p\n", machine, process);
   return;
 }
@@ -437,5 +437,5 @@
 
   fprintf (stderr, "can't find an active process for this machine!\n");
-  fprintf (stderr, "machine: %lx\n", (size_t) machine);
+  fprintf (stderr, "machine: %p\n", machine);
 
 }
Index: unk/Ohana/src/imclean/doc/Changes.log
===================================================================
--- /trunk/Ohana/src/imclean/doc/Changes.log	(revision 6705)
+++ 	(revision )
@@ -1,9 +1,0 @@
-
-2005.10.20: imclean-1-2
-	minor changes to fix -Wall errors
-	fixed exit status
-	synched with libohana (v1.5) / libfits (v1.4) changes
-
-2005.07.06: imclean-1-1
-	some changes to use the autocoded version of the SMPData structure (was Stars)
-	support for both fits and text output formats
Index: /trunk/Ohana/src/imregister/detrend/args.detregister.c
===================================================================
--- /trunk/Ohana/src/imregister/detrend/args.detregister.c	(revision 6705)
+++ /trunk/Ohana/src/imregister/detrend/args.detregister.c	(revision 6706)
@@ -40,5 +40,5 @@
  
   /* set optional label */
-  descriptor[0].imageID = strcreate ("test");
+  descriptor[0].imageID = NULL;
   if ((N = get_argument (argc, argv, "-ID"))) {
     remove_argument (N, &argc, argv);
Index: /trunk/Ohana/src/imregister/detrend/imdef.c
===================================================================
--- /trunk/Ohana/src/imregister/detrend/imdef.c	(revision 6705)
+++ /trunk/Ohana/src/imregister/detrend/imdef.c	(revision 6706)
@@ -135,8 +135,13 @@
   }
 
-  /* set the image ID (!!!!) -- this is not being done.. */
-  if (fits_scan (&header, "CRUNID",   "%s", 1, line)) {
-    descriptor[0].imageID = strcreate (line);
+  /* set the image ID (if not supplied) based on the camera header */
+  if (descriptor[0].imageID == NULL) {
+    if (fits_scan (&header, "CRUNID",   "%s", 1, line)) {
+      descriptor[0].imageID = strcreate (line);
+    }
   }
+  if (descriptor[0].imageID == NULL) {
+    descriptor[0].imageID = strcreate ("test");
+  }  
   
   return (TRUE);
Index: /trunk/Ohana/src/imregister/doc/Change.log
===================================================================
--- /trunk/Ohana/src/imregister/doc/Change.log	(revision 6705)
+++ /trunk/Ohana/src/imregister/doc/Change.log	(revision 6706)
@@ -1,2 +1,7 @@
+
+imregister-1-4:
+  dropped IMAGE_CATALOG from config
+  fixed imageID if not in header
+  changed mkdirhier to updated version (libohana 1.7)
 
 imregister-1-3:
Index: unk/Ohana/src/misc/doc/Changes.log
===================================================================
--- /trunk/Ohana/src/misc/doc/Changes.log	(revision 6705)
+++ 	(revision )
@@ -1,23 +1,0 @@
-
-misc-1-2:
-
-  - minor changes to use new libohana (v1.5) / libfits (v1.4)
-
-2005.10.07
-
-	I was having some memory collision problems, and attempting to
-	use the ohana_allocate functions reminded me that the libFITS
-	functions were not supported under ohana_allocate.  This was
-	unhelpful.  I bit the bullet and split libohana into libohana
-	(base functions only, including ohana_allocate) and libdvo
-	(functions based on the libautocode structures).  Doing this
-	allowed me to make libFITS depend on libohana (including
-	ohana_allocate).  BUT, this forced me to change all LDFLAGS
-	entries in ohana to swap -lohana -lFITS for -lFITS -lohana,
-	and to add include <fitsio.h> in some cases.
-
-misc-1-1:
-  - dropped old, out-of-date programs
-  - minor changes for loneos.h -> dvo.h
-  - cleanup of glockfile things
-
Index: unk/Ohana/src/nightd/doc/Changes.log
===================================================================
--- /trunk/Ohana/src/nightd/doc/Changes.log	(revision 6705)
+++ 	(revision )
@@ -1,7 +1,0 @@
-
-nightd-1-2:
-  - fixed minor compile warning
-
-nightd-1-1:
-  - minor cleanups for gcc -Wall
-  - nightd will be superceded eventually by sched/pcontrol?
Index: unk/Ohana/src/perl/doc/Changes.log
===================================================================
--- /trunk/Ohana/src/perl/doc/Changes.log	(revision 6705)
+++ 	(revision )
@@ -1,10 +1,0 @@
-
-perl-1-3:
-  - added mkdist, mkhtml, mkidx for ohana support
-
-perl-1-2:
-  - modified elixir.postrun to use unified addstar (not addref)
-
-perl-1-1:
-  - fixed /usr/bin/perl references everywhere *except* mkdetrend and
-    mkfringe, which must have the path explicitly defined.
Index: unk/Ohana/src/relphot/doc/Changes.log
===================================================================
--- /trunk/Ohana/src/relphot/doc/Changes.log	(revision 6705)
+++ 	(revision )
@@ -1,9 +1,0 @@
-
-relphot-1-2: released 2005.10.20
-  - substantial changes to sync with addstar v1.3
-    (added mode/format support, new dvo load functions, etc).
-  - various cleanups (functions moved to libohana)
-  - changes to use new libohana (v1.5) / libfits (v1.4)
-
-relphot-1-1
-  - minor cleanup, loneos.h -> dvo.h