From: José Bollo <jose.bollo@iot.bzh>
Date: Mon, 3 Jun 2019 16:06:29 +0000 (+0000)
Subject: Merge "afm-unit: Simplify the Makefile"
X-Git-Tag: 7.99.2~8
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=fd72db48d6652a9bd3503779ba0bfba363ceba36;hp=ed5011bdd94bab70cd787d18a813497b06837eaa

Merge "afm-unit: Simplify the Makefile"
---

diff --git a/conf/unit/generate-unit-conf/Makefile b/conf/unit/generate-unit-conf/Makefile
index 562f025..2849d6f 100644
--- a/conf/unit/generate-unit-conf/Makefile
+++ b/conf/unit/generate-unit-conf/Makefile
@@ -6,20 +6,15 @@ FILES = $(MAIN) binder.inc provided-api.inc provided-binding.inc service.inc Mak
 
 DIR = ..
 
-#AFM_CONFIG_DIR ?= /etc/afm
-AFM_CONFIG_DIR ?= "@afm_confdir@"
-
-C = -DAFM_CONFIG_DIR=$(AFM_CONFIG_DIR)
-
 D = -DAGL_DEVEL
 
 all: $(DIR)/afm-unit.conf.in $(DIR)/afm-unit-debug.conf.in
 
 $(DIR)/afm-unit.conf.in: $(FILES)
 	@echo generating $@
-	@m4 $C $< | sed '/^[ \t]*\\*[ \t]*$$/d' > $@
+	@m4 $< | sed '/^[ \t]*\\*[ \t]*$$/d' > $@
 
 $(DIR)/afm-unit-debug.conf.in: $(FILES)
 	@echo generating $@
-	@m4 $C $D $< | sed '/^[ \t]*\\*[ \t]*$$/d' > $@
+	@m4 $D $< | sed '/^[ \t]*\\*[ \t]*$$/d' > $@
 
diff --git a/conf/unit/generate-unit-conf/service.inc b/conf/unit/generate-unit-conf/service.inc
index 839533d..dd585d5 100644
--- a/conf/unit/generate-unit-conf/service.inc
+++ b/conf/unit/generate-unit-conf/service.inc
@@ -64,8 +64,8 @@ After=UNIT_NAME_API_SOCKET({{name}},%i)
 %nl
 
 [Service]
-EnvironmentFile=-AFM_CONFIG_DIR/unit.env.d/*
-EnvironmentFile=-AFM_CONFIG_DIR/widget.env.d/{{:id}}/*
+EnvironmentFile=-@afm_confdir@/unit.env.d/*
+EnvironmentFile=-@afm_confdir@/widget.env.d/{{:id}}/*
 SmackProcessLabel=User::App::{{:id}}
 SuccessExitStatus=0 SIGKILL