From ee7c901f80fc9057ed6bd1f91d04859d764fb046 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 22 Nov 2009 18:13:29 +0000
Subject: 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
---
 src/plugins/authdata/greet/Makefile.in        | 4 +---
 src/plugins/authdata/greet/deps               | 2 +-
 src/plugins/authdata/greet_client/Makefile.in | 4 +---
 src/plugins/authdata/greet_client/deps        | 2 +-
 src/plugins/authdata/greet_server/Makefile.in | 4 +---
 src/plugins/authdata/greet_server/deps        | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'src/plugins/authdata')

diff --git a/src/plugins/authdata/greet/Makefile.in b/src/plugins/authdata/greet/Makefile.in
index 1c71c4521a..840ebc22de 100644
--- a/src/plugins/authdata/greet/Makefile.in
+++ b/src/plugins/authdata/greet/Makefile.in
@@ -1,9 +1,7 @@
-thisconfigdir=../../..
-myfulldir=plugins/authdata/greet
 mydir=plugins/authdata/greet
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
+KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
diff --git a/src/plugins/authdata/greet/deps b/src/plugins/authdata/greet/deps
index b754fcff91..ea4b503104 100644
--- a/src/plugins/authdata/greet/deps
+++ b/src/plugins/authdata/greet/deps
@@ -2,5 +2,5 @@
 # Generated makefile dependencies follow.
 #
 greet_auth.so greet_auth.po $(OUTPRE)greet_auth.$(OBJEXT): \
-  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/authdata_plugin.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5/authdata_plugin.h \
   greet_auth.c
diff --git a/src/plugins/authdata/greet_client/Makefile.in b/src/plugins/authdata/greet_client/Makefile.in
index 72d665ad27..52f2e72457 100644
--- a/src/plugins/authdata/greet_client/Makefile.in
+++ b/src/plugins/authdata/greet_client/Makefile.in
@@ -1,9 +1,7 @@
-thisconfigdir=../../..
-myfulldir=plugins/authdata/greet_client
 mydir=plugins/authdata/greet_client
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
+KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
diff --git a/src/plugins/authdata/greet_client/deps b/src/plugins/authdata/greet_client/deps
index b754fcff91..ea4b503104 100644
--- a/src/plugins/authdata/greet_client/deps
+++ b/src/plugins/authdata/greet_client/deps
@@ -2,5 +2,5 @@
 # Generated makefile dependencies follow.
 #
 greet_auth.so greet_auth.po $(OUTPRE)greet_auth.$(OBJEXT): \
-  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/authdata_plugin.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5/authdata_plugin.h \
   greet_auth.c
diff --git a/src/plugins/authdata/greet_server/Makefile.in b/src/plugins/authdata/greet_server/Makefile.in
index 3924f1b988..2793aafac5 100644
--- a/src/plugins/authdata/greet_server/Makefile.in
+++ b/src/plugins/authdata/greet_server/Makefile.in
@@ -1,9 +1,7 @@
-thisconfigdir=../../..
-myfulldir=plugins/authdata/greet_server
 mydir=plugins/authdata/greet_server
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
-KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
+KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 MODULE_INSTALL_DIR = $(KRB5_AD_MODULE_DIR)
diff --git a/src/plugins/authdata/greet_server/deps b/src/plugins/authdata/greet_server/deps
index b754fcff91..ea4b503104 100644
--- a/src/plugins/authdata/greet_server/deps
+++ b/src/plugins/authdata/greet_server/deps
@@ -2,5 +2,5 @@
 # Generated makefile dependencies follow.
 #
 greet_auth.so greet_auth.po $(OUTPRE)greet_auth.$(OBJEXT): \
-  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/authdata_plugin.h \
+  $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5/authdata_plugin.h \
   greet_auth.c
-- 
cgit