X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=autogen.sh;h=f9ad5f0a11e1830228113395b824b8cf9853d58c;hp=be88a8d6f37496485c23abb49c9423ed594f683c;hb=8e8eb8fbafcaa841fa5393e396acde27b26edf2f;hpb=66be6554807773028a0111addb8e75c3cab11117 diff --git a/autogen.sh b/autogen.sh index be88a8d6f..f9ad5f0a1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,32 +16,31 @@ # along with systemd; If not, see . if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then - cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ - chmod +x .git/hooks/pre-commit && \ - echo "Activated pre-commit hook." + cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ + chmod +x .git/hooks/pre-commit && \ + 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 + echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." + echo 'EXTRA_DIST =' > docs/gtk-doc.make else - gtkdocize - gtkdocargs=--enable-gtk-doc + gtkdocize --docdir docs/ + gtkdocargs=--enable-gtk-doc 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,14 +50,15 @@ args="$args \ " fi -echo -echo "----------------------------------------------------------------" -echo "Initialized build system. For a common configuration please run:" -echo "----------------------------------------------------------------" -echo -echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args" -echo if [ "x$1" == "xc" ]; then - ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args - make clean + ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args + make clean +else + echo + echo "----------------------------------------------------------------" + echo "Initialized build system. For a common configuration please run:" + echo "----------------------------------------------------------------" + echo + echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args" + echo fi