pullup from trunk

ticket: 2962
version_fixed: 1.4.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17138 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 89c4b8e15452a12e77724ca6aa7a77f2c2e0ef5a..707870f04c84f64eb916824196ffb28206a470e5 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -6,6 +6,11 @@
        from the first call to krb5_get_init_creds().  This can happen
        when no master KDC is configured.
 
+2005-03-14  Jeffrey Altman <jaltman@mit.edu>
+
+        * Makefile.in: fix maintainer mode since it is not supported on 
+          Windows.
+
 2005-03-03  Ken Raeburn  <raeburn@mit.edu>
 
        * x-deltat.y (tok_WS): Renamed terminal from "WS", which conflicts

diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index eb9c3af949ccd628c941258eb9951b20305dcb93..2c5572ca17e91959b4b92dcf94e01da373fc250f 100644 (file)
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -277,7 +277,10 @@ SRCS=      $(srcdir)/addr_comp.c   \
 # Someday, when we have a "maintainer mode", do this right:
 BISON=bison
 BISONFLAGS=-v # -v -> .output; -d -> .h
-$(srcdir)/deltat.c : @MAINT@ x-deltat.y
+DELTAT_DEP=@MAINT@ x-deltat.y
+##WIN32##DELTAT_DEP=
+
+$(srcdir)/deltat.c : $(DELTAT_DEP)
        $(BISON) $(BISONFLAGS) -o $(srcdir)/deltat.c $(srcdir)/x-deltat.y
 
 ##DOS##LIBOBJS = $(OBJS)