diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2016-08-27 21:47:13 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2016-08-27 21:49:55 -0400 |
| commit | 25f3d018176622f722d63a1ef62d63f402a03660 (patch) | |
| tree | 3fc695dd50511a36578f333f9d43e940347a69c2 | |
| parent | 63c95e24cf8b25c0f84602b21128e47233f14225 (diff) | |
| download | gtk-doc-stub-25f3d018176622f722d63a1ef62d63f402a03660.tar.gz | |
Fix handling of --srcdir
The handling of --srcdir in the last patch a) didn't actually change
where configure.ac was found b) didn't actualy let the --srcdir argument
through because it was rejected by later code. Fix both.
| -rw-r--r-- | gtkdocize.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gtkdocize.in b/gtkdocize.in index 874371c..d74abbc 100644 --- a/gtkdocize.in +++ b/gtkdocize.in @@ -43,10 +43,10 @@ test "$docdir" || docdir="$srcdir" # detect configure script no_configure_found=0 -if test -f configure.ac; then - configure=configure.ac -elif test -f configure.in; then - configure=configure.in +if test -f "$srcdir/configure.ac"; then + configure="$srcdir/configure.ac" +elif test -f "$srcdir/configure.in"; then + configure="$srcdir/configure.in" else no_configure_found=1 fi @@ -96,6 +96,13 @@ while test $# -gt 0; do --flavour=*) flavour=`expr "X$1" : '[^=]*=\(.*\)'` shift ;; + --srcdir) + # Handled above + shift + shift ;; + --srcdir=*) + # Handled above + shift ;; -*) echo "$progname: unrecognised option '$1'" 1>&2 echo "$usage" 1>&2 |