fix more UseInstalled problems

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

diff --git a/src/config/Imake.rules b/src/config/Imake.rules
index 662317e1330cca7eef83c33e9dc2a6410a44711b..865d474fb46bebc6c903f94cbcac7ce34aea7e40 100644 (file)
--- a/src/config/Imake.rules
+++ b/src/config/Imake.rules
@@ -525,7 +525,7 @@ install:: class.ad                                                  @@\
  * this Imakefile is within the source tree.
  */
 #ifndef DependDependency
-#ifdef UseInstalled
+#ifdef UseMakedependInstalled
 #define DependDependency() /**/
 #else
 #define DependDependency()                                             @@\
@@ -536,7 +536,7 @@ $(DEPEND):                                                          @@\
        cd $(DEPENDSRC); $(MAKE); \                                     @@\
        echo "okay, continuing in $(CURRENT_DIR)"
 
-#endif /* UseInstalled */
+#endif /* UseMakedependInstalled */
 #endif /* DependDependency */
 
 
@@ -593,7 +593,7 @@ $(IMAKE):                                                           @@\
        echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \    @@\
        $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS); fi; \       @@\
        echo "okay, continuing in $(CURRENT_DIR)")
-#endif /* UseInstalled */
+#endif /* UseImakeInstalled */
 #endif /* ImakeDependency */
 
 

diff --git a/src/config/Imake.tmpl b/src/config/Imake.tmpl
index 28293d423f7cf71dcf4bdd1af71e1e513d2e07cf..1eaec7cd7bca8eb32d4f59aa1a708ed36ae3aa58 100644 (file)
--- a/src/config/Imake.tmpl
+++ b/src/config/Imake.tmpl
@@ -675,7 +675,11 @@ STDC_TOP_INCLUDES = STDCTopIncludes
         IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
 #else
          IRULESRC = $(CONFIGSRC)
+#ifdef UseImakeInstalled
+        IMAKE_CMD = $(IMAKE) -I$(NEWTOP)$(IRULESRC) $(IMAKE_DEFINES)
+#else
         IMAKE_CMD = $(NEWTOP)$(IMAKE) -I$(NEWTOP)$(IRULESRC) $(IMAKE_DEFINES)
+#endif
 #endif
      ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \
                        $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \