From: Wayne Davison <wayned@samba.org>
Date: Sat, 1 Dec 2007 03:02:50 +0000 (-0800)
Subject: Fixed a build problem for those building in a different dir from
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/091b3459f6e89ff3f04b8287e490789011586461

Fixed a build problem for those building in a different dir from
the srcdir.  Also got rid of "cd" code in configure stub.
---

diff --git a/Makefile.in b/Makefile.in
index fcc79d09..c0908462 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,8 +127,8 @@ proto: proto.h-tstamp
 proto.h: proto.h-tstamp
 	@echo ' ' >/dev/null
 
-proto.h-tstamp: *.c lib/compat.c
-	perl mkproto.pl *.c lib/compat.c
+proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c
+	perl mkproto.pl $(srcdir)/*.c $(srcdir)/lib/compat.c
 
 man: rsync.1 rsyncd.conf.5
 
diff --git a/configure b/configure
index dec14ab0..813ca5e4 100755
--- a/configure
+++ b/configure
@@ -7,28 +7,19 @@ dir=`dirname $0`
 realconfigure="$dir/configure.sh"
 
 if test ! -f "$realconfigure"; then
-    if test x"$dir" != x -a x"$dir" != x.; then
-	curdir=`pwd`
-	cd "$dir"
-    else
-	curdir=''
-    fi
     if test -f "$HOME/build_farm/build_test.fns"; then
 	# Allow the build farm to grab latest files via rsync.
 	fetch=fetch
     else
 	fetch=''
     fi
-    if ./prepare-source $fetch; then
+    if "$dir/prepare-source" $fetch; then
 	:
     else
 	echo 'Failed to build configure.sh and/or config.h.in -- giving up.' >&2
 	rm -f "$realconfigure"
 	exit 1
     fi
-    if test x"$curdir" != x; then
-	cd "$curdir"
-    fi
 fi
 
 exec "$realconfigure" "${@}"