summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing/scripts
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2009-11-22 18:13:29 +0000
committerGreg Hudson <ghudson@mit.edu>2009-11-22 18:13:29 +0000
commitee7c901f80fc9057ed6bd1f91d04859d764fb046 (patch)
treed4e0e5e1bc234fe674572b799c5750175af5180c /src/kadmin/testing/scripts
parentd4afef7bcb12da240ea501aa3d274092569b11dc (diff)
downloadkrb5-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/kadmin/testing/scripts')
-rw-r--r--src/kadmin/testing/scripts/Makefile.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 5622fc571..36ae3b490 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,5 +1,3 @@
-thisconfigdir=../../..
-myfulldir=kadmin/testing/scripts
mydir=kadmin/testing/scripts
BUILDTOP=$(REL)..$(S)..$(S)..
PERL_PATH=@PERL_PATH@
@@ -14,9 +12,9 @@ all:: env-setup.sh $(GEN_SCRIPTS)
# Should only rebuild env_setup.sh here (use CONFIG_FILES=), but the weird krb5
# makefile post-processing is unconditional and would trash the makefile.
env-setup.sh: env-setup.stamp
-env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status \
+env-setup.stamp: $(srcdir)/env-setup.shin $(BUILDTOP)/config.status \
Makefile
- cd $(thisconfigdir) && \
+ cd $(BUILDTOP) && \
CONFIG_FILES=$(mydir)/env-setup.sh:$(mydir)/env-setup.shin $(SHELL) \
config.status
chmod +x env-setup.sh