Quote targets of some copy operations within the build tree. Needed

now for Windows since we use "/" as a directory separator in places
where Windows would also look for command options.

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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index b212c67c769a57b23230fd97eb8ba515906ade9c..9c299aa3750a02de4de81a21db77c6d3eab24d8b 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(KRB524_HDR), $(KRB524_ERR_HDR)): Quote target of
+       copy on Windows.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 514b01fccd327a7c039efaed0d90d32f7c866a7c..a601789640743cbd627184a639c3c0fad7a0162e 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -102,7 +102,7 @@ all-unix:: krb524d krb524test k524init
 includes:: $(KRB524_HDR) $(KRB524_ERR_HDR)
 
 $(KRB524_HDR): krb524.h
-##WIN32##      $(CP) $? $@
+##WIN32##      $(CP) $? "$@"
 ##WIN32##!if 0
 $(KRB524_HDR): krb524.h
        if cmp $(srcdir)/krb524.h \
@@ -115,7 +115,7 @@ $(KRB524_HDR): krb524.h
 ##WIN32##!endif
 
 $(KRB524_ERR_HDR): krb524_err.h
-##WIN32##      $(CP) $? $@
+##WIN32##      $(CP) $? "$@"
 ##WIN32##!if 0
 $(KRB524_ERR_HDR): krb524_err.h
        if cmp krb524_err.h \

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 025571033f54e51dc30527ffae05df4bdfbf22fa..948c6d7097e4fefef67f28707bdcda01a81e9cee 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(EHDRDIR)/gssapi.h, $(EHDRDIR)/gssapi_generic.h):
+       Quote target of copies.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 69653364d3850086f11396cb2e08a99127a248a7..5a36915b711dbc04984bba739b433fdfc8c0b454 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -21,9 +21,9 @@ HDRS= $(EHDRDIR)/gssapi.h \
        $(EHDRDIR)/gssapi_generic.h
 
 $(EHDRDIR)/gssapi.h: gssapi.h
-       $(CP) gssapi.h $@
+       $(CP) gssapi.h "$@"
 $(EHDRDIR)/gssapi_generic.h: $(srcdir)/gssapi_generic.h
-       $(CP) $(srcdir)/gssapi_generic.h $@
+       $(CP) $(srcdir)/gssapi_generic.h "$@"
 
 $(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 9f873f6918bc381378d9082de9af4a32a2884897..43214ce7d5acd6f90459b2ba6f45f37eb4667e4c 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(GSSAPI_KRB5_HDR)): Quote target of copy.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index bfc4e9343f6735261375b26622fac03404454d28..4ddb2e0e3a86f91295b40c440f11eda54198cc0a 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -175,7 +175,7 @@ all-windows:: $(EHDRDIR) $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
 ##DOS##        mkdir $(EHDRDIR)
 
 $(GSSAPI_KRB5_HDR): gssapi_krb5.h
-       $(CP) gssapi_krb5.h $@
+       $(CP) gssapi_krb5.h "$@"
 
 all-unix:: $(SRCS) $(HDRS) includes
 all-unix:: all-libobjs

diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index 6f3fb32d88009cb1b5769e039eb71a91e987fca4..4d73c6cf7af710ad41cd78d78ba0a45c2beb96ba 100644 (file)
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (awk-windows): Put quotes around $(EHDRDIR) since it
+       contains forward slashes now.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index b1b04b413eb0cacf8bd37611fe1c4330b7cc053c..403f15b4a157e58e3238556b561579def1fd39e4 100644 (file)
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -46,11 +46,11 @@ awk-windows:
        $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=krb5_err.c krb5_err.et
        $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=adm_err.c adm_err.et
        $(AWK) -f $(SRCTOP)/util/et/et_c.awk outfile=kv5m_err.c kv5m_err.et
-       if exist asn1_err.h copy asn1_err.h $(EHDRDIR)
-       if exist kdb5_err.h copy kdb5_err.h $(EHDRDIR)
-       if exist krb5_err.h copy krb5_err.h $(EHDRDIR)
-       if exist adm_err.h copy adm_err.h $(EHDRDIR)
-       if exist kv5m_err.h copy kv5m_err.h $(EHDRDIR)
+       if exist asn1_err.h copy asn1_err.h "$(EHDRDIR)"
+       if exist kdb5_err.h copy kdb5_err.h "$(EHDRDIR)"
+       if exist krb5_err.h copy krb5_err.h "$(EHDRDIR)"
+       if exist adm_err.h copy adm_err.h "$(EHDRDIR)"
+       if exist kv5m_err.h copy kv5m_err.h "$(EHDRDIR)"
 
 #
 # dependencies for traditional makes

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 6233e52831bcf55f42390911f66f6b78b58d06a2..6125046c78b3563f5372645a27067ad711fdb6a6 100644 (file)
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(COM_ERR_HDR)): Quote target of copy, since it
+       will now contain forward slashes even on Windows.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index cccad70df0b5719be432787d188ac874b03b1cd5..8602994895e4e4d0610a60c86974f7f1b45e9e68 100644 (file)
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -70,7 +70,7 @@ COM_ERR_HDR=$(BUILDTOP)/include/com_err.h
 all-windows:: $(COM_ERR_HDR)
 
 $(COM_ERR_HDR): com_err.h
-       $(CP) com_err.h $@
+       $(CP) com_err.h "$@"
 
 error_table.c: et_lex.lex.c 
 error_table.c: $(srcdir)/error_table.y

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 28ef0ea66af77385b0cb9cd86deeb2e1c22ba7be..dba105295c4c3ebd669c1b1c22a75fd3226db31e 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-27  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in ($(PROFILE_HDR)): Quote target of copy.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index e9ec3b29d5e1b96499891cc6c621c07e0ce31492..3041e8a6537e3de7cbefd65160b47450e6a704bf 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -57,7 +57,7 @@ all-unix:: all-libs
 all-windows:: $(PROFILE_HDR)
 
 $(PROFILE_HDR):: profile.h
-       $(CP) profile.h $@
+       $(CP) profile.h "$@"
 
 includes:: profile.h
        if cmp profile.h \