[BlueZ,04/10] build: remove dummy {conf,state}{dir,_DATA}

Message ID	20240116-autofoo-v1-4-626f6b54bd06@gmail.com
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EAC21BF22 for <linux-bluetooth@vger.kernel.org>; Tue, 16 Jan 2024 13:51:58 +0000 (UTC) From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org> Date: Tue, 16 Jan 2024 13:51:58 +0000 Subject: [PATCH BlueZ 04/10] build: remove dummy {conf,state}{dir,_DATA} Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240116-autofoo-v1-4-626f6b54bd06@gmail.com> References: <20240116-autofoo-v1-0-626f6b54bd06@gmail.com> In-Reply-To: <20240116-autofoo-v1-0-626f6b54bd06@gmail.com> To: linux-bluetooth@vger.kernel.org Cc: Emil Velikov <emil.velikov@collabora.com> Reply-To: <emil.l.velikov@gmail.com>
Series	Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service \| expand [BlueZ,00/10] Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service [BlueZ,01/10] build: remove unused AM_CONDITIONAL [BlueZ,02/10] build: tweak PKG_CHECK_MODULES calls [BlueZ,03/10] build: require libudev 196, circa 2012 [BlueZ,04/10] build: remove dummy {conf,state}{dir,_DATA} [BlueZ,05/10] build: remove unused variable builtin_nodist [BlueZ,06/10] build: remove .service files from DEPENDENCIES lists [BlueZ,07/10] build: remove explicit DEPENDENCIES handling [BlueZ,08/10] build: manage .service.in files via configure.ac [BlueZ,09/10] build: enable gc/dead code removal [BlueZ,10/10] build: install dbus-org.bluez.obex.service symlink

Message ID

20240116-autofoo-v1-4-626f6b54bd06@gmail.com

State

New

Headers

From: Emil Velikov via B4 Relay <devnull+emil.l.velikov.gmail.com@kernel.org>
Date: Tue, 16 Jan 2024 13:51:58 +0000
Subject: [PATCH BlueZ 04/10] build: remove dummy {conf,state}{dir,_DATA}
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240116-autofoo-v1-4-626f6b54bd06@gmail.com>
References: <20240116-autofoo-v1-0-626f6b54bd06@gmail.com>
In-Reply-To: <20240116-autofoo-v1-0-626f6b54bd06@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Emil Velikov <emil.velikov@collabora.com>
Reply-To: <emil.l.velikov@gmail.com>

Series

Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service | expand

Commit Message

Emil Velikov via B4 Relay Jan. 16, 2024, 1:51 p.m. UTC

From: Emil Velikov <emil.velikov@collabora.com>

The project does not install anything in the respective confdir and
statedir(s). Since no files are installed, the respective folders are
not created either - systemd will create them prior to starting the
service(s).

The *dir variables themselves are no longer used in *service.in, so
remove everything.
---
 Makefile.am | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e738eb3a5..16d6bf160 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,15 +28,9 @@  AM_CFLAGS = $(MISC_CFLAGS) $(WARNING_CFLAGS) $(UDEV_CFLAGS) $(LIBEBOOK_CFLAGS) \
 				$(LIBEDATASERVER_CFLAGS) $(ell_cflags)
 AM_LDFLAGS = $(MISC_LDFLAGS)
 
-confdir = $(sysconfdir)/bluetooth
-statedir = $(localstatedir)/lib/bluetooth
-
 if DATAFILES
 dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d
 dbus_DATA = src/bluetooth.conf
-
-conf_DATA =
-state_DATA =
 endif
 
 if SYSTEMD
@@ -747,9 +741,7 @@  MAINTAINERCLEANFILES = Makefile.in \
 
 SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 		$(SED) -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
-		       -e 's,@libexecdir\@,$(libexecdir),g' \
-		       -e 's,@statedir\@,$(statedir),g' \
-		       -e 's,@confdir\@,$(confdir),g' \
+		       -e 's,@libexecdir\@,$(libexecdir),g'
 		< $< > $@
 
 if RUN_RST2MAN

[BlueZ,04/10] build: remove dummy {conf,state}{dir,_DATA}

Commit Message

Patch