summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>1998-11-27 04:29:33 +0000
committerElliot Lee <sopwith@src.gnome.org>1998-11-27 04:29:33 +0000
commit071d90572bc104e872b58eee733ebb2bd03d7fef (patch)
tree8a4c5bbe75e9e94dbb2455df474f4e404125d17f
parentafb9248ab5337a3d8791b5fffcaa23d847eb896a (diff)
downloadgnome-common-071d90572bc104e872b58eee733ebb2bd03d7fef.tar.gz
. 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=485
-rw-r--r--macros/autogen.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/macros/autogen.sh b/macros/autogen.sh
index 998bc88..f99299b 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