diff options
author | Greg Hudson <ghudson@mit.edu> | 2009-11-22 18:13:29 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2009-11-22 18:13:29 +0000 |
commit | ee7c901f80fc9057ed6bd1f91d04859d764fb046 (patch) | |
tree | d4e0e5e1bc234fe674572b799c5750175af5180c /src/plugins/authdata | |
parent | d4afef7bcb12da240ea501aa3d274092569b11dc (diff) | |
download | krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.zip krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.gz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.bz2 |
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
Diffstat (limited to 'src/plugins/authdata')
-rw-r--r-- | src/plugins/authdata/greet/Makefile.in | 4 | ||||
-rw-r--r-- | src/plugins/authdata/greet/deps | 2 | ||||
-rw-r--r-- | src/plugins/authdata/greet_client/Makefile.in | 4 | ||||
-rw-r--r-- | src/plugins/authdata/greet_client/deps | 2 | ||||
-rw-r--r-- | src/plugins/authdata/greet_server/Makefile.in | 4 | ||||
-rw-r--r-- | src/plugins/authdata/greet_server/deps | 2 |
6 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/authdata/greet/Makefile.in b/src/plugins/authdata/greet/Makefile.in index 1c71c45..840ebc2 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 b754fcf..ea4b503 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 72d665a..52f2e72 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 b754fcf..ea4b503 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 3924f1b..2793aaf 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 b754fcf..ea4b503 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 |