From: Michael Adam <obnox@samba.org>
Date: Wed, 12 Sep 2012 21:45:50 +0000 (+0200)
Subject: build:dist: make use of file / distfile more obvious in handling of DIST_FILES in... 
X-Git-Tag: samba-4.0.0rc1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36b2732426c4301bdbea99bb34fccdd767af044d;p=thirdparty%2Fsamba.git

build:dist: make use of file / distfile more obvious in handling of DIST_FILES in "make dist"

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/buildtools/wafsamba/samba_dist.py b/buildtools/wafsamba/samba_dist.py
index a2c75593f27..30902c4f049 100644
--- a/buildtools/wafsamba/samba_dist.py
+++ b/buildtools/wafsamba/samba_dist.py
@@ -175,11 +175,8 @@ def dist(appname='',version=''):
 
             absfile = os.path.join(srcdir, file)
 
-            if destfile != file:
-                file = destfile
-
-            fname = dist_base + '/' + file
-            add_tarfile(tar, fname, absfile, file)
+            fname = dist_base + '/' + destfile
+            add_tarfile(tar, fname, absfile, destfile)
 
     tar.close()