diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-22 15:37:09 +0000 |
commit | a827c5eab32a43ade5551259ea56a6a1af7e861b (patch) | |
tree | e6707df68f72baa8645210ba931272285116ad85 /autogen.sh | |
parent | 46d333783a968ab39e0beade9c7a1eec8035f8b1 (diff) | |
parent | 99bfc2a2a1689da1e173cb2f8ef54d2b09ef3a5d (diff) |
Merge branch 'upstream'
Conflicts:
glusterfs.spec.in
xlators/mgmt/glusterd/src/Makefile.am
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd.h
Change-Id: I27bdcf42b003cfc42d6ad981bd2bf8180176806d
Diffstat (limited to 'autogen.sh')
-rwxr-xr-x | autogen.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh index 8642deba2..eb869d52e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -64,7 +64,7 @@ fi if [ "x${PYTHONBIN}" = "x" ]; then PYTHONBIN=python fi -env ${PYTHONBIN} -V > /dev/null 2>&1 +env ${PYTHONBIN} -V > /dev/null 2>&1 if [ $? -ne 0 ]; then MISSING="$MISSING python" fi @@ -108,7 +108,7 @@ $AUTOMAKE --add-missing --copy --foreign # Run autogen in the argp-standalone sub-directory echo "Running autogen.sh in argp-standalone ..." -( cd argp-standalone;./autogen.sh ) +( cd contrib/argp-standalone;./autogen.sh ) # Instruct user on next steps echo |