From af0aa59638bba4221742694a29fd314038cbf861 Mon Sep 17 00:00:00 2001
From: htgoebel <htgoebel@4ebea2bb-67d4-0310-8558-a5799e421b66>
Date: Thu, 20 Jan 2005 18:05:45 +0000
Subject: [PATCH] SCons build system: corrected building of ChangeLogs when
 building rpms

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

diff --git a/SConscript b/SConscript
index d9fca58..1837ea9 100644
--- a/SConscript
+++ b/SConscript
@@ -37,31 +37,30 @@ changelog_header = """
 # ChangeLog.complete lists all changes in all branches if needed
 # for reference.
 """
-cl = env.Command(
-    '#/ChangeLog', None,
-    [Echo('$TARGET', changelog_header),
-     Echo('$TARGET', ''),
-     # need to set locale to set correct character encoding
-     'LANG=de_DE svn log -v -r "HEAD:{2005-01-01}" >> $TARGET'
-     ])
+cl = File('#/ChangeLog')
 env.ExtraDist(cl)
 if is_dist or 'ChangeLog' in COMMAND_LINE_TARGETS:
+    cl = env.Command(cl, None,
+        [Echo('$TARGET', changelog_header),
+         Echo('$TARGET', ''),
+         # need to set locale to set correct character encoding
+         'LANG=de_DE svn log -v -r "HEAD:{2005-01-01}" >> $TARGET'
+         ])[0]
     env.AlwaysBuild(cl)
 
-
 changelog_complete_header = """
 # This file is automatically generated from the Subversion
 # repository. It contains all changes in all development branches
 # and is only meant for reference purposes. If you want to see the
 # changes which lead to this release, please refer to the ChangeLog
 """
-cl = env.Command(
-    '#/ChangeLog.complete', None,
-    [Echo('$TARGET', changelog_complete_header),
-     Echo('$TARGET', ''),
-     # need to set locale to set correct character encoding
-     'LANG=de_DE svn log -v $SVNREPOSITORY >> $TARGET'
-     ])
+cl = File('#/ChangeLog.complete')
 env.ExtraDist(cl)
-if is_dist or 'ChangeLog.complete' in COMMAND_LINE_TARGETS:
+if is_dist or 'ChangeLog' in COMMAND_LINE_TARGETS:
+    cl = env.Command(cl, None,
+                     [Echo('$TARGET', changelog_complete_header),
+                      Echo('$TARGET', ''),
+                      # need to set locale to set correct character encoding
+                      'LANG=de_DE svn log -v $SVNREPOSITORY >> $TARGET'
+                      ])[0]
     env.AlwaysBuild(cl)
diff --git a/SConstruct b/SConstruct
index 22f6faa..c3694f6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -227,7 +227,8 @@ def Get_sfftobmp_Version(context):
 
 # A Shortcut
 is_dist = ('dist' in COMMAND_LINE_TARGETS or
-           'distcheck' in COMMAND_LINE_TARGETS)
+           'distcheck' in COMMAND_LINE_TARGETS or
+           'rpms' in COMMAND_LINE_TARGETS)
 
 ###---####---###---####---###---####---###---####---###---####---###---###