From: Wayne Davison <wayne@opencoder.net>
Date: Sat, 20 Jun 2020 14:58:50 +0000 (-0700)
Subject: Fix compiling in a separate dir.
X-Git-Tag: v3.2.1pre1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19617f7b4a423b8262e24111d1edc7a1c422525f;p=thirdparty%2Frsync.git

Fix compiling in a separate dir.
---

diff --git a/Makefile.in b/Makefile.in
index 31ddc43b..5fe567a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,10 +132,10 @@ rounding.h: rounding.c rsync.h proto.h
 	@rm -f rounding.out
 
 simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
+	$(CXX) -I. $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
 
 lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s
-	$(CC) -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s
+	$(CC) -I. -c -o $@ $(srcdir)/lib/md5-asm-x86_64.s
 
 tls$(EXEEXT): $(TLS_OBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS)
diff --git a/md2man b/md2man
index 22965019..ef4e58d6 100755
--- a/md2man
+++ b/md2man
@@ -83,8 +83,9 @@ def main():
     fi.title = fi.prog + '(' + fi.sect + ') man page'
     fi.mtime = 0
 
-    if os.path.lexists(fi.srcdir + '.git'):
-        fi.mtime = int(subprocess.check_output('git log -1 --format=%at'.split()))
+    git_dir = fi.srcdir + '.git'
+    if os.path.lexists(git_dir):
+        fi.mtime = int(subprocess.check_output(['git', '--git-dir', git_dir, 'log', '-1', '--format=%at']))
 
     env_subs = { 'prefix': os.environ.get('RSYNC_OVERRIDE_PREFIX', None) }
 
@@ -92,15 +93,15 @@ def main():
         env_subs['VERSION'] = '1.0.0'
         env_subs['libdir'] = '/usr'
     else:
-        for fn in 'NEWS.md Makefile'.split():
+        for fn in (fi.srcdir + 'NEWS.md', 'Makefile'):
             try:
-                st = os.lstat(fi.srcdir + fn)
+                st = os.lstat(fn)
             except:
                 die('Failed to find', fi.srcdir + fn)
             if not fi.mtime:
                 fi.mtime = st.st_mtime
 
-        with open(fi.srcdir + 'Makefile', 'r', encoding='utf-8') as fh:
+        with open('Makefile', 'r', encoding='utf-8') as fh:
             for line in fh:
                 m = re.match(r'^(\w+)=(.+)', line)
                 if not m: