summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Kohl <jtkohl@mit.edu>1991-03-05 10:27:36 +0000
committerJohn Kohl <jtkohl@mit.edu>1991-03-05 10:27:36 +0000
commitc79c8945ccf169daa69af58d2181e9aebf5512e3 (patch)
treeee5e3fa1fb4d9850534bc57323a98b9136ff4159
parent1621a1b50bb4dc0745e2263d0683f30dfd27b043 (diff)
downloadkrb5-c79c8945ccf169daa69af58d2181e9aebf5512e3.tar.gz
krb5-c79c8945ccf169daa69af58d2181e9aebf5512e3.tar.xz
krb5-c79c8945ccf169daa69af58d2181e9aebf5512e3.zip
remove conditional gunk for local/installed copies
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1855 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/Imakefile30
1 files changed, 1 insertions, 29 deletions
diff --git a/src/Imakefile b/src/Imakefile
index 500e9ef16a..4de390e07f 100644
--- 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