summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2005-06-08 06:24:53 +0000
committerEric Anholt <anholt@freebsd.org>2005-06-08 06:24:53 +0000
commit7c8e397ddcbd0ae998cc4f23868726022d1aa47b (patch)
tree0d868cc19ab2ff368f9db820c3208d39bce058e8
parent58c7263ca5b64a21dc101bb4b24201ba67a8d068 (diff)
Install the xtrans.m4 to the directory returned by aclocal --print-ac-dir,
so that the aclocal calls in other modules will pick it up if this prefix's aclocal dir is not in a default path for system aclocal.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 3227b95..ce96754 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ Xtransinclude_HEADERS = \
Xtransutil.c \
transport.c
-aclocaldir = $(datadir)/aclocal
+aclocaldir = @ACLOCALDIR@
aclocal_DATA = xtrans.m4
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index d48834b..37d351f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,10 @@ AC_CHECK_FUNC(fchown, [fchown_define="-DHAS_FCHOWN"], [fchown_define=""])
AC_SUBST(fchown_define)
+ACLOCALDIR=`aclocal --print-ac-dir`
+
+AC_SUBST(ACLOCALDIR)
+
# sticky bit
#
# if any system exists without sticky dir bits this