From ee7c901f80fc9057ed6bd1f91d04859d764fb046 Mon Sep 17 00:00:00 2001 From: Greg Hudson 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/kadmin/testing/scripts/Makefile.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/kadmin/testing/scripts') 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 -- cgit