Fixed a few mac paths

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

diff --git a/src/mac/Makefile b/src/mac/Makefile
index d6ce6f59bb0c54621c969b6f149f03dd47592da3..a867294e0f78992db3d1007ac45b2c54822c5d54 100644 (file)
--- a/src/mac/Makefile
+++ b/src/mac/Makefile
@@ -294,7 +294,7 @@ autogenerated-files = 
        Duplicate -y {root-folder}lib:gssapi:generic:gssapi.hin {root-folder}lib:gssapi:generic:gssapi.h
        
 {root-folder}include:autoconf.h Ä {root-folder}mac:libraries:autoconf.h
-       Duplicate -y {root-folder}libraries:autoconf.h {root-folder}include:autoconf.h
+       Duplicate -y {root-folder}mac:libraries:autoconf.h {root-folder}include:autoconf.h
 
 ##############################################################################################################
 ###                    High-level abstract targets -- this is where we decide on options
@@ -345,26 +345,26 @@ autogenerated-files = 
 ### The following variables are platform- or kind-specific, but constant
 
 standard-libraries-ppc-debug                   = ¶
-       ¶"{root-folder}bin:MIT CLib.PPC.debug¶" ¶
-       ¶"{root-folder}bin:MIT RuntimeLib.PPC.debug¶" ¶
+       ¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.PPC.debug¶" ¶
+       ¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.PPC.debug¶" ¶
        ¶"{MWPPCLibraries}MSL ShLibRuntime.Lib¶" ¶
        ¶"{SharedLibraries}InterfaceLib¶" ¶
        ¶"{SharedLibraries}MathLib¶"
 standard-libraries-68k-debug                   = ¶
-       ¶"{root-folder}bin:MIT CLib.68K.debug¶" ¶
-       ¶"{root-folder}bin:MIT RuntimeLib.68K.debug¶" ¶
+       ¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.68K.debug¶" ¶
+       ¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.68K.debug¶" ¶
        ¶"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib¶" ¶
        ¶"{SharedLibraries}InterfaceLib¶" ¶
        ¶"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib¶"
 standard-libraries-ppc-final                   = ¶
-       ¶"{root-folder}bin:MIT CLib.PPC¶" ¶
-       ¶"{root-folder}bin:MIT RuntimeLib.PPC¶" ¶
+       ¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.PPC¶" ¶
+       ¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.PPC¶" ¶
        ¶"{MWPPCLibraries}MSL ShLibRuntime.Lib¶" ¶
        ¶"{SharedLibraries}InterfaceLib¶" ¶
        ¶"{SharedLibraries}MathLib¶"
 standard-libraries-68k-final                   = ¶
-       ¶"{root-folder}bin:MIT CLib.68K¶" ¶
-       ¶"{root-folder}bin:MIT RuntimeLib.68K¶" ¶
+       ¶"{root-folder}:::MITSupportLib:CLib:Binaries:CLib.PPC¶" ¶
+       ¶"{root-folder}:::MITSupportLib:RuntimeLib:Binaries:RuntimeLib.68K¶" ¶
        ¶"{MW68KLibraries}MSL ShLibRuntimeCFM68K.Lib¶" ¶
        ¶"{SharedLibraries}InterfaceLib¶" ¶
        ¶"{MW68KLibraries}MathLibCFM68K (4i_8d).Lib¶"
@@ -542,7 +542,7 @@ precompiled-headers-folder = {root-folder}mac:libraries:
 precompiled-headers-ppc = {precompiled-headers-folder}KerberosHeaders.PPC
 precompiled-headers-68k = {precompiled-headers-folder}KerberosHeaders.68K
 
-precompiled-headers-source = {precompiled-headers-folder}mac:KerberosHeaders.pch
+precompiled-headers-source = {precompiled-headers-folder}KerberosHeaders.pch
 
 {precompiled-headers-ppc} Ä {precompiled-headers-source} {precompiled-headers-folder}KerberosHeaders.h
        {compiler-ppc} {precompiled-headers-source} {common-compiler-options} {ppc-compiler-options} ¶
@@ -892,14 +892,14 @@ glue-krb5 
 
 {krb5-library-glue-output} Ä {root-folder}mac:K5.CFMglue.cin {root-folder}mac:K5.CFMglue.proto.h ¶
        {root-folder}mac:CFMglue.c {root-folder}mac:K5.moreCFMglue.cin {classic-glue-generation-script}
-       {create-folder} {gss-library-glue-output-folder}
+       {create-folder} {krb5-library-glue-output-folder}
        perl {classic-glue-generation-script} < {root-folder}mac:K5.CFMglue.proto.h > {root-folder}mac:K5.CFMglue.c
        Catenate {root-folder}mac:K5.CFMglue.cin {root-folder}mac:CFMglue.c {root-folder}mac:K5.CFMglue.c ¶
        {root-folder}mac:K5.moreCFMglue.cin | Catenate > {krb5-library-glue-output}
 
 {gss-library-glue-output} Ä {root-folder}mac:GSS.CFMglue.cin {root-folder}mac:GSS.CFMglue.proto.h ¶
        {root-folder}mac:CFMglue.c {root-folder}mac:GSS.moreCFMglue.cin {classic-glue-generation-script}
-       {create-folder} {krb5-library-glue-output-folder}
+       {create-folder} {gss-library-glue-output-folder}
        perl {classic-glue-generation-script} < {root-folder}mac:GSS.CFMglue.proto.h > {root-folder}mac:GSS.CFMglue.c
        Catenate {root-folder}mac:GSS.CFMglue.cin {root-folder}mac:CFMglue.c {root-folder}mac:GSS.CFMglue.c ¶
        {root-folder}mac:GSS.moreCFMglue.cin | Catenate > {gss-library-glue-output}