[Valgrind-valkyrie-dev] valkyrie: r522 - trunk/src

[<sv...@va...>]

Author: sewardj
Date: 2010-10-19 17:27:26 +0100 (Tue, 19 Oct 2010)
New Revision: 522

Log:

* don't require gdbmacros.cpp

* fix up generation of vk_config.h so as to give something
  usable on Fedora 14.  (possible bash vs dash issue?)



Modified:
   trunk/src/src.pro


Modified: trunk/src/src.pro
===================================================================
--- trunk/src/src.pro	2010-10-18 21:33:15 UTC (rev 521)
+++ trunk/src/src.pro	2010-10-19 16:27:26 UTC (rev 522)
@@ -33,7 +33,7 @@
 
 #TODO: This seems to work, but surely can't be right... what to do?
 #QtCreator wants this for debugging info
-SOURCES += /usr/share/qtcreator/gdbmacros/gdbmacros.cpp
+#SOURCES += /usr/share/qtcreator/gdbmacros/gdbmacros.cpp
 
 
 ######################################################################
@@ -134,9 +134,7 @@
 
 VK_DEFINES_H = utils/vk_defines.h
 system(rm -f $${VK_DEFINES_H})  # make sure build fails if can't generate.
-system("echo '\
-$${LITERAL_HASH}define VK_NAME      \t \"$$NAME\"\n\
-$${LITERAL_HASH}define VK_VERSION   \t \"$$VERSION\"\n\
-$${LITERAL_HASH}define VK_PACKAGE   \t \"$$PACKAGE\"\n\
-$${LITERAL_HASH}define VK_DOC_PATH  \t \"$$doc.path\"\n\
-' > $$VK_DEFINES_H")
+system("echo '$${LITERAL_HASH}define VK_NAME     \"$$NAME\"'      > $$VK_DEFINES_H")
+system("echo '$${LITERAL_HASH}define VK_VERSION  \"$$VERSION\"'  >> $$VK_DEFINES_H")
+system("echo '$${LITERAL_HASH}define VK_PACKAGE  \"$$PACKAGE\"'  >> $$VK_DEFINES_H")
+system("echo '$${LITERAL_HASH}define VK_DOC_PATH \"$$doc.path\"' >> $$VK_DEFINES_H")