Undo the changes to docbook.py.

I don't quite understand what's going wrong, but not having the
directory in my dependency tree seems to cause more trouble than
it solves.

1 files changed, 7 insertions, 13 deletions

diff --git a/site_scons/site_tools/docbook.py b/site_scons/site_tools/docbook.py
index e1b04b58..c0da4d56 100644
--- a/site_scons/site_tools/docbook.py
+++ b/site_scons/site_tools/docbook.py
@@ -15,7 +15,7 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-from SCons.Script import Delete, Entry, File
+from SCons.Script import Dir, File
 import re
 
 def exists():
@@ -39,19 +39,13 @@ ending in "/" and leaving this parameter False.'''
         args = [File(xml)]
 
     if target_is_directory:
-        target_subst = '%s/' % target
-        # Create a dummy target that gets the dependency, to avoid
-        # weirdness that happens when directories get into the
-        # dependency tree.
-        target_stamp = '%s.stamp' % target
-        result = env.Command(target_stamp, args,
-                             [Delete('${output_html}'),
-                              ['xsltproc', '-o', '${output_html}/'] + env.Flatten(args),
-                              'echo ${output_html.get_csig()} > ${TARGET.abspath}'],
-                             output_html = env.Dir(target_subst))
+        target_subst = '${TARGET}/'
+        target_node = Dir(target)
     else:
         target_subst = '$TARGET'
-        result = env.Command(Entry(target), args,
-                             [['xsltproc', '-o', target_subst] + env.Flatten(args)])
+        target_node = File(target)
+
+    result = env.Command(target_node, args,
+                         [['xsltproc', '-o', target_subst] + env.Flatten(args)])
 
     return result