aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-18 14:33:30 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-18 14:33:30 -0500
commit20cafa40aff48ebba695ade6ed8dd20779065b59 (patch)
tree604b34bc6e6f1cc1814a7226564f4a7dae7c4a6e
parent1271439e62b7bebbc11b2663cb36f25379fe62b8 (diff)
parent5d3f97c65af769b59da9b909f52951646f85cd28 (diff)
downloadlibayatana-indicator-20cafa40aff48ebba695ade6ed8dd20779065b59.tar.gz
libayatana-indicator-20cafa40aff48ebba695ade6ed8dd20779065b59.tar.bz2
libayatana-indicator-20cafa40aff48ebba695ade6ed8dd20779065b59.zip
merge lp:~evgeni/libindicator/multiarch-same-devheaders so that we don't include build-time filenames in comments of the enum header files.
-rw-r--r--libindicator/indicator-object-enum-types.c.template4
-rw-r--r--libindicator/indicator-object-enum-types.h.template2
2 files changed, 3 insertions, 3 deletions
diff --git a/libindicator/indicator-object-enum-types.c.template b/libindicator/indicator-object-enum-types.c.template
index dd7d595..e5b3352 100644
--- a/libindicator/indicator-object-enum-types.c.template
+++ b/libindicator/indicator-object-enum-types.c.template
@@ -3,8 +3,8 @@
/*** END file-header ***/
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-#include "@filename@"
+/* enumerations from "@basename@" */
+#include "@basename@"
/*** END file-production ***/
/*** BEGIN value-header ***/
diff --git a/libindicator/indicator-object-enum-types.h.template b/libindicator/indicator-object-enum-types.h.template
index 07175a0..2ac8ef8 100644
--- a/libindicator/indicator-object-enum-types.h.template
+++ b/libindicator/indicator-object-enum-types.h.template
@@ -10,7 +10,7 @@ G_BEGIN_DECLS
/*** END file-header ***/
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN file-tail ***/