Makefile.in: Change Windows kerbsrc.zip target so this now does what

	kerbsrc-nt.zip used to do.  We no longer support building krb5 on
	systems with 8.3 limitations.  Also allow binary files in windows/lib
	to be included into kerbsrc.zip file.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index d7fb0880e219b93fad8f24f711c812fc49251a20..fde7df5701522c204465ddc71742541cbbd41e62 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb  8 21:42:44 1999  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * Makefile.in: Change Windows kerbsrc.zip target so this now does
+               what kerbsrc-nt.zip used to do.  We no longer support
+               building krb5 on systems with 8.3 limitations.  Also allow
+               binary files in windows/lib to be included into
+               kerbsrc.zip file.
+
 Wed Jan 27 17:10:18 1999  Tom Yu  <tlyu@mit.edu>
 
        * configure.in: Fix typo so that lib/crypto actually gets

diff --git a/src/Makefile.in b/src/Makefile.in
index 9c5acc20c4fc4eaacfd0e611857ec7a5cce9aff4..c9d5625827a4e4ae51a927240c0b4967cf3fd500 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -324,7 +324,8 @@ MACFILES= mac/* mac/kconfig/* mac/libraries/* config/* include/* \
 MITWINFILES= mit/windows/include/* 
 MITWINBINARYFILES= mit/windows/lib/*
 
-WINBINARYFILES=        windows/*/*.ico windows/*/*.doc windows/*/*.hlp windows/*/*.hpj
+WINBINARYFILES=        windows/*/*.ico windows/*/*.doc windows/*/*.hlp \
+       windows/*/*.hpj windows/lib/*.lib
 
 #
 # Part of building the PC release has to be done on Unix. This includes
@@ -377,39 +378,33 @@ dos-Makefile:
                sed -e 's/^##DOS##//' -e 's/^##DOS//' > Makefile
        cp windows/mkbin.bat .
 
-kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list
-       rm -f kerbsrc.zip
-       $(ZIP) -Dlk kerbsrc.zip `cat winfile.list`
-       $(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES)
-       if test -d mit ; then \
-               $(ZIP) -Dk kerbsrc.zip $(MITWINBINARYFILES) ; \
-       fi
-       rm -f $(CLEANUP)
-
-kerbsrc-nt.zip: dos-Makefile awk-windows-mac winfile.list
-       rm -f kerbsrc-nt.zip
-       $(ZIP) -Dl kerbsrc-nt.zip `cat winfile.list`
-       $(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES)
+# Not supported....
+krbsrc83.zip: dos-Makefile awk-windows-mac winfile.list
+       rm -f krbsrc83.zip
+       $(ZIP) -Dlk krbsrc83.zip `cat winfile.list`
+       $(ZIP) -Dk krbsrc83.zip $(WINBINARYFILES)
        if test -d mit ; then \
-               $(ZIP) -D kerbsrc-nt.zip $(MITWINBINARYFILES) ; \
+               $(ZIP) -Dk krbsrc83.zip $(MITWINBINARYFILES) ; \
        fi
        rm -f $(CLEANUP)
 
-dos-zipfiles: dos-Makefile awk-windows-mac winfile.list
+kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list
        rm -f kerbsrc.zip
-       $(ZIP) -Dlk kerbsrc.zip `cat winfile.list`
-       $(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES)
-       if test -d mit ; then \
-               $(ZIP) -Dk kerbsrc.zip $(MITWINBINARYFILES) ; \
-       fi
-       rm -f kerbsrc-nt.zip
-       $(ZIP) -Dl kerbsrc-nt.zip `cat winfile.list`
-       $(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES)
+       $(ZIP) -Dl kerbsrc.zip `cat winfile.list`
+       $(ZIP) -D kerbsrc.zip $(WINBINARYFILES)
        if test -d mit ; then \
-               $(ZIP) -D kerbsrc-nt.zip $(MITWINBINARYFILES) ; \
+               $(ZIP) -D kerbsrc.zip $(MITWINBINARYFILES) ; \
        fi
        rm -f $(CLEANUP)
 
+kerbsrc-nt.zip: kerbsrc-nt-is-obsolete
+
+kerbsrc-nt-is-obsolete:
+       @echo "Kerbsrc-nt.zip is now obsolete.  Just use and build kerbsrc.zip"
+       @echo "We don't support building under 8.3 restricted filesystems"
+       @echo "anymore, so what was kerbsrc-nt.zip is now kerbsrc.zip."
+       @echo " "
+
 Macfile: macfile.list 
        rm -f Macfile
        sed -e 's|/|:|g' -e 's/^/:/' -e '/:.:/d' -e '/:mac:/d' macfile.list > macfile.maclist