pull up r17725 from trunk

ticket: 3503
version_fixed: 1.4.4

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

diff --git a/src/windows/identity/Makefile b/src/windows/identity/Makefile
index 078e7cb2f91d6590706e3f85a01208b19a219ba4..d0ff8891a214a0c066a3a903a2621225c28389d3 100644 (file)
--- a/src/windows/identity/Makefile
+++ b/src/windows/identity/Makefile
@@ -173,7 +173,7 @@ afsplugin: plugincommon
        $(ECHO) -- Done with $@\r
 !endif\r
 \r
-finale: krb5plugin\r
+finale: krb5plugin doc\r
        $(ECHO) -- Done.\r
 \r
 pdoc:\r

diff --git a/src/windows/identity/doc/Makefile b/src/windows/identity/doc/Makefile
index b9cc463b3b8ada719c9bfd40e9f8f0b808bb1763..fe2d91919c72b4794c6435ac610a9ebdf3b57089 100644 (file)
--- a/src/windows/identity/doc/Makefile
+++ b/src/windows/identity/doc/Makefile
@@ -51,7 +51,7 @@ INPUT += "$(SRC)\util"
 INPUT += "$(SRC)\doc"\r
 INPUT += "$(SRC)\kmm"\r
 INPUT += "$(SRC)\kherr"\r
-!ifndef NO_AFS\r
+!ifdef BUILD_AFS\r
 INPUT += "$(SRC)\plugins\afs"\r
 !endif\r
 \r
@@ -59,7 +59,7 @@ IMAGE_PATH = "$(SRC)\doc\images"
 \r
 INCLUDE_PATH = "$(INCDIR)" "$(SRC)\include"\r
 \r
-CHM_FILE = "$(DOCDIR)\devdocs.chm"\r
+CHM_FILE = "$(DOCDIR)\netiddev.chm"\r
 <<\r
        -$(HHC) $(DOCDIR)\html\index.hhp\r
 \r