diff options
| author | James Henstridge <james@jamesh.id.au> | 2004-10-28 11:36:17 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2004-10-28 11:36:17 +0000 |
| commit | 31b4557e615233e6972b32e293b94eb012c01b07 (patch) | |
| tree | f00aac8646a3d38ccfe517079c9a3403b202be0a | |
| parent | 1f8e2e6d8f103f543ac31db0403be26243a52902 (diff) | |
| download | shared-mime-info-31b4557e615233e6972b32e293b94eb012c01b07.tar.gz | |
if the directory is read only, skip it. This helps in cases where a
2004-10-28 James Henstridge <james@jamesh.id.au>
* gnome-autogen.sh: if the directory is read only, skip it. This
helps in cases where a directory from a failed "make distcheck" is
lying around. Should fix bug #136093.
svn path=/trunk/; revision=3480
| -rw-r--r-- | macros2/ChangeLog | 4 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index ace54b86..fc5fb906 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,5 +1,9 @@ 2004-10-28 James Henstridge <james@jamesh.id.au> + * gnome-autogen.sh: if the directory is read only, skip it. This + helps in cases where a directory from a failed "make distcheck" is + lying around. Should fix bug #136093. + * gnome-autogen.sh (m4dir): fix up the AC_CONFIG_MACRO_DIR check to work with sub-package configure.in's. diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 4ad6b89e..c22eb60d 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -319,7 +319,7 @@ if [ "$DIE" -eq 1 ]; then exit 1 fi -if test -z "$*"; then +if [ "$#" = 0 ]; then printerr "**Warning**: I am going to run \`configure' with no arguments." printerr "If you wish to pass any to it, please specify them on the" printerr \`$0\'" command line." @@ -330,8 +330,10 @@ topdir=`pwd` for configure_ac in $configure_files; do dirname=`dirname $configure_ac` basename=`basename $configure_ac` - if test -f $dirname/NO-AUTO-GEN; then + if [ -f $dirname/NO-AUTO-GEN ]; then echo skipping $dirname -- flagged as no auto-gen + elif [ ! -w $dirname ]; then + echo skipping $dirname -- directory is read only else printbold "Processing $configure_ac" cd $dirname |