Imakefile, Makefile: Don't `make clean-imake' since (1) it's useless,

and (2) it fails mysteriously under Linux.
README: update instructions

diff --git a/Imakefile b/Imakefile
index f98ca26d2f467fb0a5dfb4d3b222f460e49d91a5..5efcf5ba8d25a714e23887b5c87964a29896bc12 100644 (file)
--- a/Imakefile
+++ b/Imakefile
@@ -27,7 +27,6 @@ all::
 #ifndef USELOCALTOOLS
 
 world::
-       make ${MFLAGS} clean-imake
        make ${MFLAGS} imake
        make ${MFLAGS} Makefile
        make ${MFLAGS} Makefiles
@@ -37,16 +36,12 @@ world::
 #else /* USELOCALTOOLS */
 
 world::
-       make ${MFLAGS} clean-imake
        make ${MFLAGS} Makefile
        make ${MFLAGS} Makefiles
        make ${MFLAGS} depend
        make ${MFLAGS} all
 #endif /* USELOCALTOOLS */
 
-clean-imake:
-       cd util/imake; make clean
-
 imake::
        cd util/imake; make 
 

diff --git a/Makefile b/Makefile
index aff57e98789f25662ff381674243191489e4c9b1..207d9c7ee62d2746762c3fec1ca20bed407e3124 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -135,15 +135,11 @@ SUBDIRS=$(CLIENTDIRS)
 all::
 
 world::
-       make ${MFLAGS} clean-imake
        make ${MFLAGS} Makefile
        make ${MFLAGS} Makefiles
        make ${MFLAGS} depend
        make ${MFLAGS} all
 
-clean-imake:
-       cd util/imake; make clean
-
 imake::
        cd util/imake; make
 

diff --git a/README b/README
index 664e711172c48ebf6ade54990e22f1372f9de81b..199272822ddd4c94c608caefc88c05ffe83d405d 100644 (file)
--- a/README
+++ b/README
@@ -8,11 +8,6 @@ separate from the tree(s) containing binaries.  We have
 found this useful since we have to have separate sets of binaries,
 for different platforms.
 
-The default value of the root of the Moira source tree
-(this directory) is /mit/moiradev/src.  You can set it
-to something else by specifying, for example, "make SRCDIR=/x/y/z"
-if you want the source in /x/y/z.
-
 Here are the steps for building the Moira source.
 
 1.  Create a directory to hold the tree of object files,
@@ -28,29 +23,22 @@ Here are the steps for building the Moira source.
 
 3.  Cd to util/imake.includes.  Read through config.Imakefile, turning
     on appropriate flags for your installation, and setting the paths
-    to your include files, libs, etc for Kerberos Hesiod and Zephyr.*
+    to your include files, libs, etc for Kerberos, Hesiod and Zephyr.*
     Note that we are not licensed to distribute gdss, so it is not
     included in this distribution.  Therefore you will probably not
-    want to define it.  Change SRCTOP appropriately.
+    want to define it.
+
+    If you are building the server binaries, uncomment the #define
+    SVR_BUILD line, and make sure you have ORACLE_HOME set in your
+    environment.
 
 4.  Cd to include.  Read through moira_site.h adjusting the paths to
     what you want on your system.  Also change the #define of
     MOIRA_SERVER to be the name of the server you are planning on
-    using.
+    using. (Note that this is only used if hesiod lookup fails.)
 
 5.  Still in the top of the object directory (/foo/bar/baz
-    of Step 1), type "make world" (or "make world  SRCDIR=/x/y/z).
-
-    Note: the mmoira client uses X11r4 and motif 1.1.
-
-    Notes on building the server: When building the server (if you are
-    using Ingres) make sure to define the environment variable
-    II_SYSTEM appropriately, and add the ingres/bin directory to your
-    path.  Building the server also requires having perl in your path.
-    It is only used in one place, in order to get around an ingres
-    bug that sets certain field sizes incorrectly when doing an ascii
-    dump of the database, causing data to be lost.  The perl script is
-    src/backup/esql_fix.pl.
+    of Step 1), type "make world"
 
 6.  Run "make install".  You may want to check that programs
     are installed where you want.  Then add the appropriate