diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-05-31 00:09:31 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-05-31 00:09:31 +0000 |
| commit | 246523a6906c8e5c744360f53721c83feb719581 (patch) | |
| tree | 63354fa1894168d23f7d020be54163d069a3f25c /src/kadmin/testing | |
| parent | 47e795e735027ca77fa2f64462b77b53ac0169a8 (diff) | |
| download | krb5-246523a6906c8e5c744360f53721c83feb719581.tar.gz krb5-246523a6906c8e5c744360f53721c83feb719581.tar.xz krb5-246523a6906c8e5c744360f53721c83feb719581.zip | |
Merge about 1/3 of the remaining configure scripts into the top level. This
still leaves out appl and tests, and static library and plugin directories.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18068 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/Makefile.in | 4 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/Makefile.in | 10 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in index c164a7e24..74600d1c9 100644 --- a/src/kadmin/testing/Makefile.in +++ b/src/kadmin/testing/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./.. +thisconfigdir=../.. myfulldir=kadmin/testing -mydir=testing +mydir=kadmin/testing BUILDTOP=$(REL)..$(S).. LOCAL_SUBDIRS = scripts util diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in index 3f58e9248..6161b1db8 100644 --- a/src/kadmin/testing/scripts/Makefile.in +++ b/src/kadmin/testing/scripts/Makefile.in @@ -1,8 +1,8 @@ -thisconfigdir=./../.. +thisconfigdir=../../.. myfulldir=kadmin/testing/scripts -mydir=testing/scripts +mydir=kadmin/testing/scripts BUILDTOP=$(REL)..$(S)..$(S).. -PERL=@PERL@ +PERL_PATH=@PERL_PATH@ .SUFFIXES: .plin .pl @@ -17,7 +17,7 @@ env-setup.sh: env-setup.stamp env-setup.stamp: $(srcdir)/env-setup.shin $(thisconfigdir)/config.status \ Makefile cd $(thisconfigdir) && \ - CONFIG_FILES=./testing/scripts/env-setup.sh:./testing/scripts/env-setup.shin $(SHELL) \ + CONFIG_FILES=$(mydir)/env-setup.sh:$(mydir)/env-setup.shin $(SHELL) \ config.status chmod +x env-setup.sh touch env-setup.stamp @@ -28,7 +28,7 @@ restore_files.sh: .plin.pl: -rm -f $@.tmp - echo "#!$(PERL)" > $@.tmp + echo "#!$(PERL_PATH)" > $@.tmp sed 1d $< >> $@.tmp chmod +x $@.tmp mv $@.tmp $@ diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index fa3c3827f..cf38caec1 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=./../.. +thisconfigdir=../../.. myfulldir=kadmin/testing/util -mydir=testing/util +mydir=kadmin/testing/util BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/ # Force Tcl headers to use stdarg.h, because krb5 does too, and if |