chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: talk directly to the journald, instead to the stdout-syslog-bridge
[elogind.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index 55a115d4e3b3d3fa814301908dc11855cbc6ca0f..3b9dd1fd166626e4f7fde0c6e3b2ca6c7142c5ac 100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-48,9
+48,9
@@
if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
echo "Activated pre-commit hook."
fi
echo "Activated pre-commit hook."
fi
-if type -p colorgcc > /dev/null ; then
- export CC=colorgcc
-fi
+libdir() {
+ echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
if [ "x$1" = "xam" ] ; then
run_versioned automake "$AM_VERSION" -a -c --foreign
if [ "x$1" = "xam" ] ; then
run_versioned automake "$AM_VERSION" -a -c --foreign
@@
-67,7
+67,14
@@
else
run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
if [ "x$1" != "xac" ]; then
run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
if [ "x$1" != "xac" ]; then
- CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --with-rootdir= --libexecdir=/usr/lib "$@"
+ CFLAGS="$CFLAGS -g -O0" ./configure \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libdir=$(libdir /usr/lib) \
+ --with-rootlibdir=$(libdir /lib) \
+ --libexecdir=/usr/lib \
+ "$@"
make clean
fi
fi
make clean
fi
fi