aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-18 14:39:49 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-18 14:39:49 -0500
commit2723b6c1064be7f5f1d4557416f774d02b233a49 (patch)
tree05298171899faca46f64c72cd2b2dc3cef79c01a
parent0bf6adacf509aff960b1f450e4c7f01c3f4ca090 (diff)
parent96fc7f90f40b8835d5ab1fbd4169fc35aa17cf18 (diff)
downloadlibayatana-appindicator-2723b6c1064be7f5f1d4557416f774d02b233a49.tar.gz
libayatana-appindicator-2723b6c1064be7f5f1d4557416f774d02b233a49.tar.bz2
libayatana-appindicator-2723b6c1064be7f5f1d4557416f774d02b233a49.zip
merge bzr merge lp:~evgeni/libappindicator/multiarch-same-devheaders so that we don't include build-time filenames in comments of the enum header files.
-rw-r--r--src/app-indicator-enum-types.c.in2
-rw-r--r--src/app-indicator-enum-types.h.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app-indicator-enum-types.c.in b/src/app-indicator-enum-types.c.in
index e200396..26276dc 100644
--- a/src/app-indicator-enum-types.c.in
+++ b/src/app-indicator-enum-types.c.in
@@ -32,7 +32,7 @@ License version 3 and version 2.1 along with this program. If not, see
/*** END file-header ***/
/*** BEGIN file-production ***/
-#include "@filename@"
+#include "@basename@"
/*** END file-production ***/
/*** BEGIN value-header ***/
diff --git a/src/app-indicator-enum-types.h.in b/src/app-indicator-enum-types.h.in
index a055d71..33e501f 100644
--- a/src/app-indicator-enum-types.h.in
+++ b/src/app-indicator-enum-types.h.in
@@ -44,7 +44,7 @@ G_END_DECLS
/*** END file-tail ***/
/*** BEGIN file-production ***/
-/* Enumerations from file: "@filename@" */
+/* Enumerations from file: "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/