Merge remote-tracking branch 'origin/develop' into macos

Perry Werneck
2 parents 30d35f61 4361b403
Showing 1 changed file with 1 additions and 3 deletions Show diff stats
autogen.sh
@@ -3,7 +3,6 @@
 test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
  
-olddir=`pwd`
 cd "$srcdir"
  
 mkdir -p scripts
@@ -46,8 +45,7 @@ automake --add-missing 2&gt; /dev/null | true
  
 autopoint
  
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
+test -n "$NOCONFIGURE" || "$srcdir/configure" $@
...	...	@@ -3,7 +3,6 @@
3	3	test -n "$srcdir" \|\| srcdir=`dirname "$0"`
4	4	test -n "$srcdir" \|\| srcdir=.
5	5
6		-olddir=`pwd`
7	6	cd "$srcdir"
8	7
9	8	mkdir -p scripts
...	...	@@ -46,8 +45,7 @@ automake --add-missing 2> /dev/null \| true
46	45
47	46	autopoint
48	47
49		-cd "$olddir"
50		-test -n "$NOCONFIGURE" \|\| "$srcdir/configure" "$@"
	48	+test -n "$NOCONFIGURE" \|\| "$srcdir/configure" $@
51	49
52	50
53	51
...	...