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/preauth/encrypted_challenge | |
| parent | d4afef7bcb12da240ea501aa3d274092569b11dc (diff) | |
| download | krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.gz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.tar.xz krb5-ee7c901f80fc9057ed6bd1f91d04859d764fb046.zip | |
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/preauth/encrypted_challenge')
| -rw-r--r-- | src/plugins/preauth/encrypted_challenge/Makefile.in | 4 | ||||
| -rw-r--r-- | src/plugins/preauth/encrypted_challenge/deps | 16 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/plugins/preauth/encrypted_challenge/Makefile.in b/src/plugins/preauth/encrypted_challenge/Makefile.in index 57c0392f4..2e2f41612 100644 --- a/src/plugins/preauth/encrypted_challenge/Makefile.in +++ b/src/plugins/preauth/encrypted_challenge/Makefile.in @@ -1,9 +1,7 @@ -thisconfigdir=../../.. -myfulldir=plugins/preauth/encrypted_challenge mydir=plugins/preauth/encrypted_challenge 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_PA_MODULE_DIR) diff --git a/src/plugins/preauth/encrypted_challenge/deps b/src/plugins/preauth/encrypted_challenge/deps index f5bb24248..9eaab4fd9 100644 --- a/src/plugins/preauth/encrypted_challenge/deps +++ b/src/plugins/preauth/encrypted_challenge/deps @@ -4,12 +4,12 @@ encrypted_challenge_main.so encrypted_challenge_main.po \ $(OUTPRE)encrypted_challenge_main.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \ - $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-buf.h \ - $(SRCTOP)/include/k5-err.h $(SRCTOP)/include/k5-gmt_mktime.h \ - $(SRCTOP)/include/k5-int-pkinit.h $(SRCTOP)/include/k5-int.h \ - $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/krb5.h \ - $(SRCTOP)/include/krb5/authdata_plugin.h $(SRCTOP)/include/krb5/locate_plugin.h \ - $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(srcdir)/../fast_factor.h \ + $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(srcdir)/../fast_factor.h \ + $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \ + $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \ + $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \ + $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \ + $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \ + $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \ + $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \ encrypted_challenge_main.c |