aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>1998-11-27 12:29:33 +0800
committerElliot Lee <sopwith@src.gnome.org>1998-11-27 12:29:33 +0800
commitc7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a (patch)
tree8a10ca7e8ecdfa9e6229f38e31c17eb40eed79dc /macros
parent4faeacf5abb764837e14e1767104f263368b9d0d (diff)
downloadgsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.tar
gsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.tar.gz
gsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.tar.bz2
gsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.tar.lz
gsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.tar.xz
gsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.tar.zst
gsoc2013-evolution-c7fa75f1d23ee71edb5fe0325e30bd3e6c3dbd6a.zip
. libgnome/gnome-mime.c: read gnomedatadir/mime.types as well . In
. libgnome/gnome-mime.c: read gnomedatadir/mime.types as well . In general, move data files not associated with any specific directory into a 'gnome-data' directory. svn path=/trunk/; revision=489
Diffstat (limited to 'macros')
-rw-r--r--macros/autogen.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 998bc88a30..f99299b0a0 100644
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -78,20 +78,12 @@ do
done
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-if [ ! -z "$OBJ_DIR" ]; then
- mkdir -p "$OBJ_DIR"
- cd "$OBJ_DIR"
-fi
if test x$NOCONFIGURE = x; then
-echo running $srcdir/$OBJ_DIR/configure $conf_flags "$@"
-if [ -z "$OBJ_DIR" ]; then
+echo running $srcdir/configure $conf_flags "$@"
+
$srcdir/configure $conf_flags "$@" \
&& echo Now type \`make\' to compile $PKG_NAME
else
- $srcdir/../configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME
-fi
-else
echo Skipping configure process.
fi