remove conditional gunk for local/installed copies

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

diff --git a/src/Imakefile b/src/Imakefile
index 500e9ef16af9622f1e6326927da1b20bb3f7f2e5..4de390e07fe1d157367ac5a67b885edf700c8f87 100644 (file)
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -14,32 +14,12 @@
 /* default target... */
 all::
 
-#ifdef UseComErrInstalled
-COMERRDIR=
-world::
-       $(RM) include/com_err.h
-#else
-COMERRDIR=comerr
-world::
-       $(RM) include/com_err.h
-       $(LN) ../comerr/com_err.h include/com_err.h
-#endif
-#ifdef UseSSInstalled
-SSDIR=
-#else
-SSDIR=ss
-#endif
-#ifdef UseUnifdefInstalled
-UNIFDIR=
-#else
-UNIFDIR=util/unifdef
-#endif
 world::
        make ${MFLAGS} mastermakefiles
        make ${MFLAGS} depend
        make ${MFLAGS} all
 
-SUBDIRS = $(UNIFDIR) include $(COMERRDIR) $(SSDIR) lib kdc admin clients appl
+SUBDIRS = include lib kdc admin clients appl
 LNINSTALLDIRS = 
 
 MakeSubdirs($(SUBDIRS))
@@ -47,15 +27,7 @@ MakeSubdirs($(SUBDIRS))
 depend:: includes
 
 /**/# rebuild the Makefiles in the master source tree
-#ifdef UseImakeInstalled
-mastermakefiles::
-       -$(MV) Makefile Makefile.bak
-       $(MAKE) -f Makefile.bak Makefile
-       $(MAKE) Makefiles
-#else
 mastermakefiles::
-       cd $(IMAKESRC); $(MAKE) -f Makefile.ini clean; $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
        -$(MV) Makefile Makefile.bak
        $(MAKE) -f Makefile.bak Makefile
        $(MAKE) Makefiles
-#endif