From 8c8d5d9b22db7ef78b20ebfe530b5acf56bfdcca Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 27 Aug 2002 16:24:53 +0000 Subject: [PATCH] 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 --- src/krb524/ChangeLog | 5 +++++ src/krb524/Makefile.in | 4 ++-- src/lib/gssapi/generic/ChangeLog | 5 +++++ src/lib/gssapi/generic/Makefile.in | 4 ++-- src/lib/gssapi/krb5/ChangeLog | 4 ++++ src/lib/gssapi/krb5/Makefile.in | 2 +- src/lib/krb5/error_tables/ChangeLog | 5 +++++ src/lib/krb5/error_tables/Makefile.in | 10 +++++----- src/util/et/ChangeLog | 5 +++++ src/util/et/Makefile.in | 2 +- src/util/profile/ChangeLog | 4 ++++ src/util/profile/Makefile.in | 2 +- 12 files changed, 40 insertions(+), 12 deletions(-) diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index b212c67c7..9c299aa37 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,8 @@ +2002-08-27 Ken Raeburn + + * Makefile.in ($(KRB524_HDR), $(KRB524_ERR_HDR)): Quote target of + copy on Windows. + 2002-08-23 Ken Raeburn * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index 514b01fcc..a60178964 100644 --- 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 025571033..948c6d709 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +2002-08-27 Ken Raeburn + + * Makefile.in ($(EHDRDIR)/gssapi.h, $(EHDRDIR)/gssapi_generic.h): + Quote target of copies. + 2002-08-23 Ken Raeburn * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index 69653364d..5a36915b7 100644 --- 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 9f873f691..43214ce7d 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,7 @@ +2002-08-27 Ken Raeburn + + * Makefile.in ($(GSSAPI_KRB5_HDR)): Quote target of copy. + 2002-08-23 Ken Raeburn * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index bfc4e9343..4ddb2e0e3 100644 --- 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 6f3fb32d8..4d73c6cf7 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,8 @@ +2002-08-27 Ken Raeburn + + * Makefile.in (awk-windows): Put quotes around $(EHDRDIR) since it + contains forward slashes now. + 2002-08-23 Ken Raeburn * 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 b1b04b413..403f15b4a 100644 --- 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 6233e5283..6125046c7 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,8 @@ +2002-08-27 Ken Raeburn + + * Makefile.in ($(COM_ERR_HDR)): Quote target of copy, since it + will now contain forward slashes even on Windows. + 2002-08-23 Ken Raeburn * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index cccad70df..860299489 100644 --- 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 28ef0ea66..dba105295 100644 --- a/src/util/profile/ChangeLog +++ b/src/util/profile/ChangeLog @@ -1,3 +1,7 @@ +2002-08-27 Ken Raeburn + + * Makefile.in ($(PROFILE_HDR)): Quote target of copy. + 2002-08-23 Ken Raeburn * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index e9ec3b29d..3041e8a65 100644 --- 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 \ -- 2.26.2