Adapt generated output to always print paths relative to

the asn1/<proto>/ subdir. This makes cmake generated builds
look identical to autotools generated builds.

svn path=/trunk/; revision=51775

1 files changed, 8 insertions, 1 deletions

diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py
index 0ee8c9ae1e..75b5830936 100755
--- a/tools/asn2wrs.py
+++ b/tools/asn2wrs.py
@@ -2914,7 +2914,14 @@ class EthOut:
         out += self.outcomment(' '.join(sys.argv), comment)
         out += '\n'
         # Make Windows path separator look like Unix path separator
-        return out.replace('\\', '/')
+        out = out.replace('\\', '/')
+	# Change abolute paths from cmake builds to relative paths as used
+	# in autotools for identical output of both build systems.
+	out = re.sub(r'(/[^ ]*/tools/)', '../../tools/', out)
+	out = re.sub(r'(/[^ ]*/epan/)', '../../epan/', out)
+	out = re.sub(r'(/[^ ]*/asn1/[^\s/]*)', '.', out)
+	out = re.sub(r'(/[^ ]*/asn1/[^\s]/)', './', out)
+	return out
 
     #--- dbg_print -------------------------------------------------------
     def dbg_print(self):