preparing to get bootstrapping to work

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3646 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/Imakefile b/src/Imakefile
index 43ab4b1c743db48ac9beb1817e27d2a137702f11..b14fe335a2caf834969e3670bcd4de696ba67444 100644 (file)
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -29,11 +29,14 @@
 all::
 
 world::
-       date
-       make ${MFLAGS} mastermakefiles
-       make ${MFLAGS} depend
-       make ${MFLAGS} all
-       date
+       @date
+       cd $(IMAKESRC); $(MAKE) $(MFLAGS) -f Makefile.ini clean; $(MAKE) $(MFLAGS) -f Makefile.ini BOOSTRAPCFLAGS="$(BOOTSTAPCFLAGS)"
+       -$(RM) Makefile.bak; $(MV) Makefile Makefile.bak
+       $(MAKE) $(MFLAGS) -f Makefile.bak Makefile
+       $(MAKE) ${MFLAGS} mastermakefiles
+       $(MAKE) ${MFLAGS} depend
+       $(MAKE) ${MFLAGS} all
+       @date
 
 SUBDIRS = util include lib kdc admin kadmin slave clients appl tests \
                config-files

diff --git a/src/config/Project.tmpl b/src/config/Project.tmpl
index f9e4888a25b163b00274de9834334b651b5ea8de..39daf3dcb102da561102713e443a8399cd1c0c19 100644 (file)
--- a/src/config/Project.tmpl
+++ b/src/config/Project.tmpl
@@ -19,10 +19,18 @@
 #define MkCmdsCmd $(TOP)/util/ss/mk_cmds
 #endif
 #ifndef DependCmd
+#ifdef UseMakedependInstalled
 #define DependCmd makedepend           /* assume BINDIR in path */
+#else
+#define DependCmd $(DEPENDSRC)/makedepend
+#endif
 #endif
 #ifndef ImakeCmd
+#ifdef UseImakeInstalled
 #define ImakeCmd imake
+#else
+#define ImakeCmd $(IMAKESRC)/imake
+#endif
 #endif
 #ifndef SSLib
 #define SSLib $(TOPLIBD)/libss.a
@@ -563,6 +571,8 @@ P_KRB4_COMPAT=-UKrb4Compat
      TOP_INCLUDES = -I$(TOP)/include $(STDC_TOP_INCLUDES)
    EXTRA_INCLUDES = ExtraIncludes
         CONFIGSRC = $(TOP)/config
+         IMAKESRC = $(CONFIGSRC)
+        DEPENDSRC = $(TOP)/util/makedepend
          PSYFLAGS = PepsyFlags
             PEPSY = PepsyCmd
             TOUCH = TouchCmd

diff --git a/src/config/site.def b/src/config/site.def
index 788bff13ff471443fc904ad8791372e3e1b2445a..100b152aa34de855c0d8bec8c14b906e8cb1cc28 100644 (file)
--- a/src/config/site.def
+++ b/src/config/site.def
@@ -188,8 +188,8 @@
 #define PepsyCmd IsodeDir/@sys/bin/pepsy
 #endif
 
-#define UseImakeInstalled /* -- turn on if you have imake installed */
-#define UseMakedependInstalled /* -- turn on if you have makedepend installed */
+/* #define UseImakeInstalled -- turn on if you have imake installed */
+/* #define UseMakedependInstalled -- turn on if you have makedepend installed */
 #define Krb4ApplCompat /* turn this on if you want selected applications to
                          work with both v4 & v5 code */
 #define Krb4KDCCompat /* turn this on if you want the KDC to provide v4