Exclude the MAC and DOS tar/zip files when creating the Mac tar file.

Adjust the windows NT exclusion file so that it works correctly; zip
is a little bit touchy about file specifications.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 4eb902abb9571e0d84a3110e95f48c509ef5708b..d6a0401bbff4b55cbd86b62c4a676a296b23cb23 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 Fri Sep 22 19:39:30 1995  Theodore Y. Ts'o  <tytso@dcl>
 
+       * Makefile.in: Exclude the MAC and DOS tar/zip files when creating
+               the Mac tar file.  Adjust the windows NT exclusion file so
+               that it works correctly; zip is a little bit touchy about
+               file specifications.
+
        * Makefile.in (awk-windows-mac): Build the error table header
                files into include, not include/krb5; and construct krb5.h
                from krb5.hin and the error table header files.

diff --git a/src/Makefile.in b/src/Makefile.in
index 3c6ce0c7a68a1b09b4b6c7a61faf3135f9755e97..f955a4e4cf322d95c759928e7ba536dc2d0641f3 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -214,7 +214,12 @@ WINEXCLUDE= LIB/KRB5.SAB \
        WINDOWS/CNS/*.ICO WINDOWS/WINTEL/*.ICO WINDOWS/GSS/*.ICO \
        *.O *.A *.ZIP *.TAR
 
-MACEXCLUDE= windows 
+NTEXCLUDE= ./lib/krb5.sab \
+       ./include/krb5/autoconf.h \
+       ./lib/crypto/md4/t_mddriv ./lib/crypto/md5/t_mddriv \
+       ./util/profile/test_par ./util/profile/test_pro \
+       windows/cns/*.ico windows/wintel/*.ico windows/gss/*.ico \
+       ./*.zip ./*.tar
 
 CLEANUP= util/profile/profile.h util/profile/prof_err.[ch] \
        lib/krb5/error_tables/asn1_err.c lib/krb5/error_tables/kdb5_err.c \
@@ -233,9 +238,9 @@ kerbsrc.zip: awk-windows-mac
        mv Makefile Makefile.bak
        cp Makefile.in Makefile
        rm -f kerbsrc.zip
-       $(ZIP) -Dlk kerbsrc.zip $(FILES) $(WINFILES) -x $(EXCLUDE) $(WINEXCLUDE)
+       $(ZIP) -Dlk kerbsrc.zip $(FILES) $(WINFILES) -x $(WINEXCLUDE)
        $(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES)
-       cp Makefile.bak Makefile
+       mv Makefile.bak Makefile
        rm -f $(CLEANUP)
 
 kerbsrc-nt.zip: awk-windows-mac
@@ -243,16 +248,13 @@ kerbsrc-nt.zip: awk-windows-mac
        mv Makefile Makefile.bak
        cp Makefile.in Makefile
        rm -f kerbsrc-nt.zip
-       $(ZIP) -Dl kerbsrc-nt.zip $(FILES) $(WINFILES) -x $(EXCLUDE) $(WINEXCLUDE)
+       $(ZIP) -Dl kerbsrc-nt.zip $(FILES) $(WINFILES) -x $(NTEXCLUDE)
        $(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES)
-       cp Makefile.bak Makefile
+       mv Makefile.bak Makefile
        rm -f $(CLEANUP)
 
 kerbsrc.mac: awk-windows-mac
-       rm -f excludefiles 
-       /bin/ls $(MACEXCLUDE) >excludefiles
-       tar cvfX kerbsrc.tar excludefiles `find $(FILES) $(MACFILES) -prune -type f -print`
-       rm -f excludefiles
+       tar cvf kerbsrc.tar `find $(FILES) $(MACFILES) -prune -type f -print | grep -v kerbsrc`
        rm -f $(CLEANUP)
 
 #