diff options
author | Panu Matilainen <pmatilai@redhat.com> | 2007-08-22 11:24:43 +0300 |
---|---|---|
committer | Panu Matilainen <pmatilai@redhat.com> | 2007-08-22 11:24:43 +0300 |
commit | 9a56f09925152e9ca6afc9db82fb15698a6d2428 (patch) | |
tree | f34b70828c95ef3631a4b58986747d05609a4d0d | |
parent | 33b067521227a463fa95a60eb72cadc783fc9afc (diff) | |
download | rpm-9a56f09925152e9ca6afc9db82fb15698a6d2428.tar.gz rpm-9a56f09925152e9ca6afc9db82fb15698a6d2428.tar.bz2 rpm-9a56f09925152e9ca6afc9db82fb15698a6d2428.zip |
Use RPMCONFIGDIR for determining rpmrc path, usrlibdir is wrong on multilib.
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/atlocal.in | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 89a1f39fc..ede849f2e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,6 +52,7 @@ atlocal: atlocal.in -e "s,[@]rpmbindir[@],$(rpmbindir)," \ -e "s,[@]usrbindir[@],$(bindir)," \ -e "s,[@]usrlibdir[@],$(libdir)," \ + -e "s,[@]RPMCONFIGDIR[@],$(RPMCONFIGDIR)," \ < $(srcdir)/atlocal.in > atlocal DISTCLEANFILES = atlocal EXTRA_DIST += atlocal.in diff --git a/tests/atlocal.in b/tests/atlocal.in index 836aa52e5..2218432ab 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -3,4 +3,4 @@ export LD_LIBRARY_PATH PATH=`pwd`/testing@rpmbindir@:`pwd`/testing@usrbindir@:$PATH export PATH -RPMRC="${abs_srcdir}/testing@usrlibdir@/rpm/rpmrc" +RPMRC="${abs_srcdir}/testing@RPMCONFIGDIR@/rpmrc" |