BIND 10 trac744, updated. c83d4bea0e9abc94b84315eb42c8ed7a879c8899 [trac744] Fix compilation from different dir

[BIND 10 source code commits]

The branch, trac744 has been updated
       via  c83d4bea0e9abc94b84315eb42c8ed7a879c8899 (commit)
      from  7e9ea719c8fda75f346eb87daae58cf06c8070e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c83d4bea0e9abc94b84315eb42c8ed7a879c8899
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue May 3 20:44:50 2011 +0200

    [trac744] Fix compilation from different dir

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/Makefile.am     |    4 ++--
 src/lib/log/compiler/message.cc |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index f893482..94c21e9 100644
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS += $(SQLITE_CFLAGS)
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
-CLEANFILES = *.gcno *.gcda
+CLEANFILES = *.gcno *.gcda messagedef.h messagedef.cc
 
 lib_LTLIBRARIES = libdatasrc.la
 libdatasrc_la_SOURCES = data_source.h data_source.cc
@@ -30,6 +30,6 @@ libdatasrc_la_LIBADD += $(top_builddir)/src/lib/cc/libcc.la
 
 BUILT_SOURCES = messagedef.h messagedef.cc
 messagedef.h messagedef.cc: Makefile messagedef.mes
-	$(top_builddir)/src/lib/log/compiler/message messagedef.mes
+	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/datasrc/messagedef.mes
 
 EXTRA_DIST = messagedef.mes
diff --git a/src/lib/log/compiler/message.cc b/src/lib/log/compiler/message.cc
index ef4bafd..07b87e0 100644
--- a/src/lib/log/compiler/message.cc
+++ b/src/lib/log/compiler/message.cc
@@ -261,7 +261,7 @@ writeHeaderFile(const string& file, const string& prefix,
         const vector<string>& ns_components, MessageDictionary& dictionary)
 {
     Filename message_file(file);
-    Filename header_file(message_file.useAsDefault(".h"));
+    Filename header_file(Filename(message_file.name()).useAsDefault(".h"));
 
     // Text to use as the sentinels.
     string sentinel_text = sentinel(header_file);
@@ -358,7 +358,7 @@ writeProgramFile(const string& file, const string& prefix,
     const vector<string>& ns_components, MessageDictionary& dictionary)
 {
     Filename message_file(file);
-    Filename program_file(message_file.useAsDefault(".cc"));
+    Filename program_file(Filename(message_file.name()).useAsDefault(".cc"));
 
     // Open the output file for writing
     ofstream ccfile(program_file.fullName().c_str());