X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=33d8fcda2342ad7cb91deba510f6fd24b54f4a26;hp=51b9d81d589dbd4ded8daf2d1f565172bf41b0ba;hb=9a9bb3ca1eddc8caa2d7aa3e6e27d270e296923f;hpb=843605d372aa000a1ad120bb9d06d04e8b1da50c

diff --git a/autogen.sh b/autogen.sh
index 51b9d81d5..33d8fcda2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #  This file is part of systemd.
 #
@@ -15,33 +15,35 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
-if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+set -e
+
+if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
+        # This part is allowed to fail
         cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
         chmod +x .git/hooks/pre-commit && \
-        echo "Activated pre-commit hook."
+        echo "Activated pre-commit hook." || :
 fi
 
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
-        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
-        echo 'EXTRA_DIST =' > gtk-doc.make
-else
+if which gtkdocize >/dev/null 2>/dev/null; then
         gtkdocize --docdir docs/
         gtkdocargs=--enable-gtk-doc
+else
+        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
+        rm -f docs/gtk-doc.make
+        echo 'EXTRA_DIST =' > docs/gtk-doc.make
 fi
 
 intltoolize --force --automake
 autoreconf --force --install --symlink
 
 libdir() {
-        echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+        echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
 }
 
 args="\
 --sysconfdir=/etc \
 --localstatedir=/var \
 --libdir=$(libdir /usr/lib) \
---libexecdir=/usr/lib \
 $gtkdocargs"
 
 if [ ! -L /bin ]; then
@@ -51,7 +53,7 @@ args="$args \
 "
 fi
 
-if [ "x$1" == "xc" ]; then
+if [ "x$1" = "xc" ]; then
         ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args
         make clean
 else