From 4f85ff54d086200ba78ab17c200894b0713efa09 Mon Sep 17 00:00:00 2001
From: htgoebel <htgoebel@4ebea2bb-67d4-0310-8558-a5799e421b66>
Date: Fri, 7 Jan 2005 15:51:52 +0000
Subject: [PATCH] SCons build: * ExtraDist() did not work if called with File
 nodes. Fixed. * Explicitly added some files (which are no longer installed
 since   r395) to the 'dist' target.

git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@397 4ebea2bb-67d4-0310-8558-a5799e421b66
---
 SConscript | 4 ++++
 SConstruct | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/SConscript b/SConscript
index 15c3a74..20d2d20 100644
--- a/SConscript
+++ b/SConscript
@@ -15,3 +15,7 @@ env.Alias('install', [
     #env.InstallAs('$sysconfdir/cron.daily/capisuite', cronfile),
     #env.InstallAs('$pkgsysconfdir/cronjob.conf','cronjob.conf'),
     ])
+
+# Since these are not installed, we need to list them for
+# distribuition explicitly
+env.ExtraDist([cronfile, rcfile, 'cronjob.conf'])
diff --git a/SConstruct b/SConstruct
index a775a03..092ae59 100644
--- a/SConstruct
+++ b/SConstruct
@@ -128,10 +128,7 @@ class InstallableEnv(Environment):
 
     def ExtraDist(self, files):
         """Collect Additional files to be distributed."""
-        if SCons.Util.is_List(files):
-            files = map(File, files)
-        else:
-            files = File(files)
+        files = self.arg2nodes(files, self.File)
         env.Append(__SOURCES=files)
 
 #