Leave srcdir as-as and use absolute form only as needed
This commit is contained in:

committed by
Viktor Dukhovni

parent
ebae52f3cc
commit
008a26c489
@@ -7,8 +7,6 @@ AC_CONFIG_SRCDIR([kuser/kinit.c])
|
||||
AC_CONFIG_HEADERS(include/config.h)
|
||||
AC_CONFIG_MACRO_DIR([cf])
|
||||
|
||||
srcdir=`cd "$srcdir" && pwd || echo "$srcdir"`
|
||||
|
||||
AM_INIT_AUTOMAKE([foreign 1.11])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
|
@@ -12,7 +12,9 @@ check_SCRIPTS = $(SCRIPT_TESTS)
|
||||
|
||||
port = 49188
|
||||
|
||||
do_subst = $(heim_verbose)sed -e 's,[@]srcdir[@],$(srcdir),g' \
|
||||
do_subst = srcdirabs=`cd "$(srcdir)"; pwd`; $(heim_verbose)sed \
|
||||
-e 's,[@]srcdir[@],$(srcdir),g' \
|
||||
-e "s,[@]srcdirabs[@],$${srcdirabs},g" \
|
||||
-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g' \
|
||||
-e 's,[@]port[@],$(port),g' \
|
||||
-e 's,[@]objdir[@],$(top_builddir)/tests/gss,g'
|
||||
|
@@ -1,4 +1,4 @@
|
||||
include @srcdir@/include-krb5.conf
|
||||
include @srcdirabs@/include-krb5.conf
|
||||
|
||||
[libdefaults]
|
||||
default_keytab_name = @objdir@/server.keytab
|
||||
|
Reference in New Issue
Block a user