From 540e970170628f81721748f9fcd875afc686e4e0 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 9 Feb 2012 08:58:44 -0500 Subject: [PATCH] gnome-shell-build-setup.sh: Fix installing jhbuild jhbuild now requires autogen.sh to be run, even when not using autotools. https://bugzilla.gnome.org/show_bug.cgi?id=668440 --- tools/build/gnome-shell-build-setup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh index 56e561a68..203577af2 100755 --- a/tools/build/gnome-shell-build-setup.sh +++ b/tools/build/gnome-shell-build-setup.sh @@ -263,8 +263,11 @@ else echo "done" fi -echo "Installing jhbuild..." -(cd $SOURCE/jhbuild && make -f Makefile.plain DISABLE_GETTEXT=1 bindir=$HOME/bin install >/dev/null) +echo -n "Installing jhbuild ... " +(cd $SOURCE/jhbuild && + ./autogen.sh --simple-install && + make -f Makefile.plain DISABLE_GETTEXT=1 bindir=$HOME/bin install) >/dev/null +echo "done" if [ -e $HOME/.jhbuildrc ] ; then if grep JHBUILDRC_GNOME_SHELL $HOME/.jhbuildrc > /dev/null ; then : ; else