Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

1 files changed, 7 insertions, 7 deletions

diff --git a/dtrace b/dtrace
index 2b261f5a..bbf6b81c 100755
--- a/dtrace
+++ b/dtrace
@@ -21,7 +21,7 @@ class provider:
         have_provider = False
         self.f = open(provider)
         self.h = open(header,mode='w')
-        self.h.write("// Generated by /usr/bin/dtrace\n")
+        self.h.write("// Generated by the Systemtap dtrace wrapper\n")
         self.h.write("\n#include <sys/sdt.h>\n\n")
         in_comment = False
         while (True):
@@ -124,21 +124,21 @@ if (build_header == False and build_source == False):
 if (filename == ""):
     if (s_filename != ""):
         filename = s_filename.replace(".d","")
+	if (build_header):
+	    filename = filename + ".h"
+	elif (build_source):
+	    filename = filename + ".o"
     else:
         usage
         sys.exit(1)
 
 if (build_header):
     providers = provider()
-    providers.open(s_filename, filename + ".h")
+    providers.open(s_filename, filename)
 elif (build_source):
     fn = "/tmp/" + os.path.basename(s_filename).replace(".d", ".c")
     f = open(fn,mode='w')
     f.write("static __dtrace () {}\n")
     f.close()
-    call("gcc -fPIC -c " + fn + " -o " + filename + ".o", shell=True)
-    f.close()
+    call("gcc -fPIC -c " + fn + " -o " + filename, shell=True)
     os.remove(fn)
-
-
-