Codebase list colord / 6aec37d
trivial: Fix make distcheck After the commits to make the daemon run as non-root, intltool was having problems during make check. This was traced back to the '<@ANNOTATE_OWNER@/>' tag, which wasn't valid XML. By making this a comment, we can do the substitution without upsetting the translation tools. Richard Hughes 12 years ago
2 changed file(s) with 19 addition(s) and 15 deletion(s). Raw diff Collapse all Expand all
+10
-6
policy/Makefile.am less more
0 org.freedesktop.color.policy.in: org.freedesktop.color.policy.in.in Makefile.am
0 org.freedesktop.color.policy.in: org.freedesktop.color.policy.in.in Makefile
11 $(AM_V_GEN)if test "x$(daemon_user)" != "xroot"; then \
2 sed -e "s|<@ANNOTATE_OWNER@/>|<annotate key=\"org.freedesktop.policykit.owner\">unix-user:$(daemon_user)</annotate>|g" $< > $@ ; \
2 sed -e "s|<!--@ANNOTATE_OWNER@-->|<annotate key=\"org.freedesktop.policykit.owner\">unix-user:$(daemon_user)</annotate>|g" $< > $@ ; \
33 else \
4 sed -e "/^\s*<@ANNOTATE_OWNER@\/>\s*$$/d;s|<@ANNOTATE_OWNER@/>||g" $< > $@ ; \
4 sed -e "/^\s*<!--@ANNOTATE_OWNER@-->\s*$$/d;s|<!--@ANNOTATE_OWNER@-->||g" $< > $@ ; \
55 fi
66
77 @INTLTOOL_POLICY_RULE@
88 polkit_policydir = $(datadir)/polkit-1/actions
9 polkit_policy_DATA = \
10 org.freedesktop.color.policy
9 polkit_policy_in_files = org.freedesktop.color.policy.in
10 polkit_policy_DATA = $(polkit_policy_in_files:.policy.in=.policy)
11 #polkit_policy_DATA = \
12 # org.freedesktop.color.policy
1113
1214 EXTRA_DIST = org.freedesktop.color.policy.in.in
13 DISTCLEANFILES = org.freedesktop.color.policy org.freedesktop.color.policy.in
15 CLEANFILES = \
16 org.freedesktop.color.policy \
17 org.freedesktop.color.policy.in
1418
1519 -include $(top_srcdir)/git.mk
+9
-9
policy/org.freedesktop.color.policy.in.in less more
2424 <allow_inactive>no</allow_inactive>
2525 <allow_active>yes</allow_active>
2626 </defaults>
27 <@ANNOTATE_OWNER@/>
27 <!--@ANNOTATE_OWNER@-->
2828 </action>
2929
3030 <action id="org.freedesktop.color-manager.create-profile">
3939 <allow_inactive>no</allow_inactive>
4040 <allow_active>yes</allow_active>
4141 </defaults>
42 <@ANNOTATE_OWNER@/>
42 <!--@ANNOTATE_OWNER@-->
4343 </action>
4444
4545 <action id="org.freedesktop.color-manager.delete-device">
5454 <allow_inactive>no</allow_inactive>
5555 <allow_active>yes</allow_active>
5656 </defaults>
57 <@ANNOTATE_OWNER@/>
57 <!--@ANNOTATE_OWNER@-->
5858 </action>
5959
6060 <action id="org.freedesktop.color-manager.delete-profile">
6969 <allow_inactive>no</allow_inactive>
7070 <allow_active>yes</allow_active>
7171 </defaults>
72 <@ANNOTATE_OWNER@/>
72 <!--@ANNOTATE_OWNER@-->
7373 </action>
7474
7575 <action id="org.freedesktop.color-manager.modify-device">
8484 <allow_inactive>no</allow_inactive>
8585 <allow_active>yes</allow_active>
8686 </defaults>
87 <@ANNOTATE_OWNER@/>
87 <!--@ANNOTATE_OWNER@-->
8888 </action>
8989
9090 <action id="org.freedesktop.color-manager.modify-profile">
9999 <allow_inactive>no</allow_inactive>
100100 <allow_active>yes</allow_active>
101101 </defaults>
102 <@ANNOTATE_OWNER@/>
102 <!--@ANNOTATE_OWNER@-->
103103 </action>
104104
105105 <action id="org.freedesktop.color-manager.install-system-wide">
119119 <allow_inactive>no</allow_inactive>
120120 <allow_active>auth_admin_keep</allow_active>
121121 </defaults>
122 <@ANNOTATE_OWNER@/>
122 <!--@ANNOTATE_OWNER@-->
123123 </action>
124124
125125 <action id="org.freedesktop.color-manager.device-inhibit">
135135 <allow_inactive>no</allow_inactive>
136136 <allow_active>yes</allow_active>
137137 </defaults>
138 <@ANNOTATE_OWNER@/>
138 <!--@ANNOTATE_OWNER@-->
139139 </action>
140140
141141 <action id="org.freedesktop.color-manager.sensor-lock">
151151 <allow_inactive>no</allow_inactive>
152152 <allow_active>yes</allow_active>
153153 </defaults>
154 <@ANNOTATE_OWNER@/>
154 <!--@ANNOTATE_OWNER@-->
155155 </action>
156156
157157 </policyconfig>