Restore unintentional deletions between r17518:17519

ticket: 3254
tags: pullup

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

diff --git a/src/Makefile.in b/src/Makefile.in
index edc2cbc9c6a45d12c3e3a49873341564b60c8492..0e47ec89c90a0f1f89aec622bb040ab00058e57a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -3,7 +3,9 @@ datadir=@datadir@
 thisconfigdir=.
 myfulldir=.
 mydir=.
-SUBDIRS=util include lib @krb524@ kdc kadmin slave clients appl tests \
+SUBDIRS=util include lib @krb524@ kdc kadmin slave clients \
+       modules/kdb/db2 \
+       appl tests \
        config-files gen-manpages
 BUILDTOP=$(REL)$(C)
 LOCALINCLUDES = -I$(srcdir) 
@@ -23,6 +25,11 @@ all-prerecurse: update-autoconf-h
 update-autoconf-h:
        (cd include && $(MAKE) krb5/autoconf.h)
 
+##DOS##!if 0
+# This makefile doesn't use lib.in, but we still need shlib.conf here.
+config.status: $(SRCTOP)/config/shlib.conf
+##DOS##!endif
+
 all-windows:: maybe-awk Makefile-windows
        @echo Making autoconf.h in include\krb5
        cd include\krb5
@@ -59,6 +66,7 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
                $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
                $(ADMIN_MANDIR) $(SERVER_MANDIR) $(CLIENT_MANDIR) \
                $(FILE_MANDIR) $(KRB5_LIBDIR) $(KRB5_INCDIR) \
+               $(KRB5_DB_MODULE_DIR) \
                $(KRB5_INCSUBDIRS) $(datadir) $(EXAMPLEDIR)
 
 install-strip:
@@ -81,6 +89,15 @@ install-headers-prerecurse: install-headers-mkdirs
 # install::
 #      $(MAKE) $(MFLAGS) install.man
 
+fake-install:
+       $(RM) -r $(FAKEPREFIX)
+       @for i in $(INSTALLMKDIRS); do \
+               $(srcdir)/config/mkinstalldirs util/fakedest$$i; \
+       done
+       (w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
+       (w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
+       (w=`pwd`; cd modules/kdb/db2 && $(MAKE) install DESTDIR="$$w/util/fakedest")
+
 TAGS: $(SRCS)
        etags $(SRCS)
 
@@ -176,7 +193,7 @@ WINMAKEFILES=Makefile \
        windows\Makefile windows\lib\Makefile \
        windows\cns\Makefile windows\gina\Makefile \
        windows\gss\Makefile windows\ms2mit\Makefile \
-       windows\wintel\Makefile windows\kfwlogon\Makefile
+       windows\wintel\Makefile windows\kfwlogon\Makefile
 
 ##DOS##Makefile-windows:: $(MKFDEP) $(WINMAKEFILES)
 
@@ -355,7 +372,8 @@ FILES= ./* \
        util/* util/et/* util/profile/*
 
 WINFILES= util/windows/* windows/* windows/lib/* windows/cns/* \
-       windows/wintel/* windows/gss/* windows/gina/* windows/ms2mit/*
+       windows/wintel/* windows/gss/* windows/gina/* windows/ms2mit/* \
+       windows/kfwlogon/*
 
 WINBINARYFILES=        windows/*/*.ico windows/*/*.doc windows/*/*.hlp \
        windows/*/*.hpj windows/lib/*.lib
@@ -565,3 +583,4 @@ krb5-config: $(srcdir)/krb5-config.in $(thisconfigdir)/config.status
 # $(PURE) or $(LDFLAGS) in case someone changes config/shlib.conf
 check-unix:: krb5-config
        $(SHELL) $(srcdir)/t_krbconf
+check-prerecurse: fake-install