* Makefile.in: Revert $(S)=>/ change, for Windows support

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

8 files changed, 31 insertions, 15 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 0d1bab5535..d606a19ccf 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in: Revert $(S)=>/ change, for Windows support.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 5da82cc54c..2ca9fdc965 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=.
 myfulldir=lib/gssapi
 mydir=.
-BUILDTOP=$(REL)../..
+BUILDTOP=$(REL)..$(S)..
 LOCAL_SUBDIRS= generic krb5
 
 ##DOSLIBNAME=$(OUTPRE)gssapi.lib
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index bde7a364a7..5f3576947b 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in: Revert $(S)=>/ change, for Windows support.
+
 2002-08-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in ($(EHDRDIR)/gssapi.h, $(EHDRDIR)/gssapi_generic.h):
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 69653364d3..f159152663 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
 myfulldir=lib/gssapi/generic
 mydir=generic
-BUILDTOP=$(REL)../../..
+BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir)
 
 ##DOS##BUILDTOP = ..\..\..
@@ -15,15 +15,15 @@ ETSRCS= gssapi_err_generic.c
 ETOBJS= $(OUTPRE)gssapi_err_generic.$(OBJEXT)
 ETHDRS= gssapi_err_generic.h
 
-EHDRDIR= $(BUILDTOP)/include/gssapi
+EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 
-HDRS=	$(EHDRDIR)/gssapi.h \
-	$(EHDRDIR)/gssapi_generic.h
+HDRS=	$(EHDRDIR)$(S)gssapi.h \
+	$(EHDRDIR)$(S)gssapi_generic.h
 
-$(EHDRDIR)/gssapi.h: gssapi.h
+$(EHDRDIR)$(S)gssapi.h: gssapi.h
 	$(CP) gssapi.h $@
-$(EHDRDIR)/gssapi_generic.h: $(srcdir)/gssapi_generic.h
-	$(CP) $(srcdir)/gssapi_generic.h $@
+$(EHDRDIR)$(S)gssapi_generic.h: $(srcdir)$(S)gssapi_generic.h
+	$(CP) $(srcdir)$(S)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 43214ce7d5..b4c6cfc6e2 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in: Revert $(S)=>/ change, for Windows support.
+
 2002-08-27  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in ($(GSSAPI_KRB5_HDR)): Quote target of copy.
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 4ddb2e0e3a..0b8eb6c88a 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=./..
 myfulldir=lib/gssapi/krb5
 mydir=krb5
-BUILDTOP=$(REL)../../..
+BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOS##BUILDTOP = ..\..\..
@@ -162,12 +162,12 @@ STLIBOBJS = \
 
 HDRS= $(ETHDRS)
 
-EHDRDIR=$(BUILDTOP)/include/gssapi
+EHDRDIR=$(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS= gssapi_krb5.h
 
 ##DOS##LIBOBJS = $(OBJS)
 
-GSSAPI_KRB5_HDR=$(EHDRDIR)/gssapi_krb5.h
+GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h
 
 all-windows:: $(EHDRDIR) $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS)
 
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 9fec6c325c..3bf40deaf8 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in: Revert $(S)=>/ change, for Windows support.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index faa516380e..78715d018c 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -1,7 +1,7 @@
 thisconfigdir=.
 myfulldir=lib/gssapi/mechglue
 mydir=.
-BUILDTOP=$(REL)../../..
+BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
@@ -82,7 +82,7 @@ OBJS	= $(OUTPRE)g_acquire_cred.$(OBJEXT) \
 	  $(OUTPRE)oid_ops.$(OBJEXT) \
 	  $(OUTPRE)g_mechname.$(OBJEXT)
 
-EHDRDIR= $(BUILDTOP)/include/gssapi
+EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS = mechglue.h
 
 @SHARED_RULE@
@@ -125,8 +125,8 @@ clean-windows::
 # Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
 install::
 	@set -x; for f in $(EXPORTED_HEADERS) ; \
-	do $(INSTALL_DATA) $(srcdir)/$$f     \
-		$(DESTDIR)$(KRB5_INCDIR)/gssapi/$$f ; \
+	do $(INSTALL_DATA) $(srcdir)$(S)$$f     \
+		$(DESTDIR)$(KRB5_INCDIR)$(S)gssapi$(S)$$f ; \
 	done
 
 includes::