Skip to content
Snippets Groups Projects
Commit 702aaf31 authored by Markus Blatt's avatar Markus Blatt
Browse files

[autotools,release] Install autoconf macros to $(datadir)/dune/aclocal

Previously, the macros were installed to $(datadir)/aclocal. As we have
some macros in DUNE that are also installed for some Linux distributions
this caused conflicts in package managers. With this patch we install
them to $(datadir)/dune/aclocal to resolve this issue outlined in flyspray
task 1409
https://dune-project.org/flyspray/index.php?do=details&task_id=1409
parent 127aa0a3
No related branches found
No related tags found
No related merge requests found
......@@ -581,12 +581,11 @@ run_default_configure () {
fi
if test x$module = x$m; then continue; fi # skip myself
name=$(eval "echo \$NAME_$m")
if test -d "$path/m4"; then
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/m4"
fi
if test -d "$path/share/aclocal"; then
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $path/share/aclocal"
fi
for dir in $path/m4 $path/share/dune/aclocal $path/share/aclocal; do
if test -d "$dir"; then
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir"
fi
done
if test -d "$path/$BUILDDIR"; then
PARAMS="$PARAMS \"--with-$name=$path/$BUILDDIR\""
else
......
......@@ -680,7 +680,7 @@ echo "- $PROJECT/m4/Makefile.am"
cat> "$PROJECT/m4/Makefile.am" << CC_DELIM
M4FILES = $MODULE.m4
aclocaldir = \$(datadir)/aclocal
aclocaldir = \$(datadir)/dune/aclocal
aclocal_DATA = \$(M4FILES)
EXTRA_DIST = \$(M4FILES) CMakeLists.txt
......@@ -692,7 +692,7 @@ CC_DELIM
echo "- $PROJECT/m4/CMakeLists.txt"
cat> "$PROJECT/m4/CMakeLists.txt" << CC_DELIM
install(PROGRAMS $MODULE.m4 DESTINATION share/aclocal)
install(PROGRAMS $MODULE.m4 DESTINATION share/dune/aclocal)
CC_DELIM
......
......@@ -47,5 +47,5 @@ install(PROGRAMS
shared_ptr.m4
umfpack.m4
xdr.m4
DESTINATION share/aclocal
DESTINATION share/dune/aclocal
)
......@@ -52,7 +52,7 @@ ALLM4S = \
umfpack.m4 \
xdr.m4
aclocaldir = $(datadir)/aclocal
aclocaldir = $(datadir)/dune/aclocal
aclocal_DATA = $(ALLM4S)
EXTRA_DIST = CMakeLists.txt $(ALLM4S)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment