From: Simon McVittie <smcv@collabora.com>
Date: Thu, 23 Jun 2022 17:55:08 +0000 (+0100)
Subject: tools: Ship disable-uac.rc instead of generating it at build time
X-Git-Tag: dbus-1.15.0~32^2~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bfd184ab71b403252afe09501318adf7de2a020;p=thirdparty%2Fdbus.git

tools: Ship disable-uac.rc instead of generating it at build time

The Meson build system ships it anyway.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/tools/Makefile.am b/tools/Makefile.am
index f8660c06b..e88ecffaa 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -137,10 +137,7 @@ SUFFIXES = .rc
 .rc.o:
 	$(RC) $< -o $@
 
-nodist_dbus_update_activation_environment_SOURCES = disable-uac.rc
-
-disable-uac.rc: Win32.Manifest
-	echo '1 24 "$<"' > $@
+dbus_update_activation_environment_SOURCES += disable-uac.rc
 endif
 
 EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c Win32.Manifest