| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | Upstream-Status: Submitted |
| 2 | |
| 3 | From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001 |
| 4 | From: Jeremy Puhlman <jpuhlman@mvista.com> |
| 5 | Date: Thu, 14 Jun 2018 17:21:49 +0000 |
| 6 | Subject: [PATCH] Switch from filename to basename |
| 7 | |
| 8 | When atk-enum-types.h is installed in to a system, the user likely has |
| 9 | no access to the location where the headers were built, especially if |
| 10 | the software was built in a sysroot environment. If the headers were |
| 11 | built for a mulitlib environment, the build pathing may be different. |
| 12 | Subsequently, if two mulitlib variants of atk are installed together the |
| 13 | headers conflict for no other reason then they were built in two |
| 14 | different locations. Switching from filename to basename, still should |
| 15 | provide sufficient information on the providence of the enums, while not |
| 16 | conflicting for really no good reason. |
| 17 | |
| 18 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> |
| 19 | --- |
| 20 | atk/atk-enum-types.h.template | 2 +- |
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 22 | |
| 23 | diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template |
| 24 | index 7b4cec4..8321c24 100644 |
| 25 | --- a/atk/atk-enum-types.h.template |
| 26 | +++ b/atk/atk-enum-types.h.template |
| 27 | @@ -14,7 +14,7 @@ G_BEGIN_DECLS |
| 28 | |
| 29 | /*** BEGIN file-production ***/ |
| 30 | |
| 31 | -/* enumerations from "@filename@" */ |
| 32 | +/* enumerations from "@basename@" */ |
| 33 | /*** END file-production ***/ |
| 34 | |
| 35 | /*** BEGIN value-header ***/ |
| 36 | -- |
| 37 | 2.14.1.459.g238e487 |
| 38 | |