From 48a19350841f0640bbe9411a6b0ab0337fae8ac3 Mon Sep 17 00:00:00 2001
From: John Kohl <jtkohl@mit.edu>
Date: Wed, 5 Sep 1990 15:45:51 +0000
Subject: [PATCH] fix more UseInstalled problems

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1089 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/config/Imake.rules | 6 +++---
 src/config/Imake.tmpl  | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/config/Imake.rules b/src/config/Imake.rules
index 662317e13..865d474fb 100644
--- 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 28293d423..1eaec7cd7 100644
--- 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 \
-- 
2.26.2