Consolidate Makefile variables now that we have only a single global

configure script:
    $(SRCTOP) --> $(top_srcdir)
    $(srcdir)/$(thisconfigdir) --> $(top_srcdir)
    $(thisconfigdir) --> $(BUILDTOP)
    $(myfulldir) --> $(mydir)

ticket: 6583
status: open

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

10 files changed, 2 insertions, 20 deletions

diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 883bf48..57eafd2 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=..
-myfulldir=appl
 mydir=appl
 BUILDTOP=$(REL)..
 
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index e64e487..ab0495a 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../..
-myfulldir=appl/gss-sample
 mydir=appl/gss-sample
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
@@ -13,7 +11,7 @@ OBJS= gss-client.o gss-misc.o gss-server.o
 all-unix:: gss-server gss-client
 
 ##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
-##WIN32##RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY
+##WIN32##RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
 
 ##WIN32##GSSCLIENT=$(OUTPRE)gss-client.exe
 ##WIN32##GSSSERVER=$(OUTPRE)gss-server.exe
diff --git a/src/appl/gss-sample/deps b/src/appl/gss-sample/deps
index 34495ea..d2e1b71 100644
--- a/src/appl/gss-sample/deps
+++ b/src/appl/gss-sample/deps
@@ -9,4 +9,4 @@ $(OUTPRE)gss-misc.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   gss-misc.c gss-misc.h
 $(OUTPRE)gss-server.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \
-  $(SRCTOP)/include/port-sockets.h gss-misc.h gss-server.c
+  $(top_srcdir)/include/port-sockets.h gss-misc.h gss-server.c
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index 8194446..dde058f 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../..
-myfulldir=appl/sample
 mydir=appl/sample
 SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index db69a13..481d81e 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../../..
-myfulldir=appl/sample/sclient
 mydir=appl/sample/sclient
 
 BUILDTOP=$(REL)..$(S)..$(S)..
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index e5ca92f..0126533 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../../..
-myfulldir=appl/sample/sserver
 mydir=appl/sample/sserver
 
 BUILDTOP=$(REL)..$(S)..$(S)..
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index c6b7baa..7681efb 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../..
-myfulldir=appl/simple
 mydir=appl/simple
 SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index c6840fe..3e53f5e 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../../..
-myfulldir=appl/simple/client
 mydir=appl/simple/client
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 12b2b04..ef64bed 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../../..
-myfulldir=appl/simple/server
 mydir=appl/simple/server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index b321cc5..0d45a18 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../..
-myfulldir=appl/user_user
 mydir=appl/user_user
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG