Fixed Makefile target

The install command was being executed with do_compile.
Because DESTDIR was not defined, the install command was not executed correctly.
Therefore, it was fixed so that the install command is not executed in do_compile.

Signed-off-by: Riku Nomoto <riku_nomoto@mail.toyota.co.jp>
Change-Id: I272fc8252db17638c70ca81b0a016b90ab3f0c06

diff --git a/service/system/interface_unified/Makefile.client b/service/system/interface_unified/Makefile.client
index 4925383..3363f66 100755 (executable)
--- a/service/system/interface_unified/Makefile.client
+++ b/service/system/interface_unified/Makefile.client
@@ -16,18 +16,12 @@
 
 SUBDIRS := library
 
-install:install_cfg install_cfg_pram
+include ../system_service.mk
 
-install_cfg_pram:
+install-data:
        install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata
        install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/system_manager/rwdata scfg_pram/gpf_ss_sm_config_data.cfg
-
-install_cfg:
        install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/power_service/rodata
        install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/power_service/rodata scfg/gpf_ss_ps_config.cfg
        install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/logger_service/rodata
        install -m 644 -t  $(DESTDIR)/etc/basesystem/BS/ss/logger_service/rodata scfg/ss_logger.cfg
-
-include ../system_service.mk
-
-.PHONY:install_cfg install_cfg_pram

diff --git a/service/system/task_manager/client/libtskmcfg/Makefile b/service/system/task_manager/client/libtskmcfg/Makefile
index a26b6c8..bb11d6f 100755 (executable)
--- a/service/system/task_manager/client/libtskmcfg/Makefile
+++ b/service/system/task_manager/client/libtskmcfg/Makefile
@@ -23,7 +23,7 @@ INST_HEADERS = tskm_xml_data.h  tskm_svcid.h task_manager_libtskmcfg.h
 libtskmcfg_SRCS = tskm_xml_data.cpp
 
 
-CPPFLAGS = -I./ -I./include -I./../../include-share -I./../../server/include 
+CPPFLAGS = -I./ -I./include -I./../../include-share -I./../../server/include
 LDFLAGS += -Wl,--no-as-needed
 LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified
 
@@ -42,7 +42,7 @@ HOSTCC=gcc
 XMLFILETOP=tskm_cfg.xml
 
 install:install-pre install-pre-header
-build-lib:install-pre install-pre-header
+build-lib:install-pre-header
 install-lib:install-pre install-pre-header
 install-pre:
        install -d -m 775  $(DESTDIR)/etc/basesystem/BS/ss/task_manager/rodata;\
@@ -50,8 +50,8 @@ install-pre:
 
 CONFIG_FILES:=tskm_wakeup.xml tskm_shutdown.xml tskm_wakeup_vup.xml tskm_shutdown_vup.xml tskm_launch.xml tskm_svcid.h agl_thread_tm.h
 
-#install-header:$(XMLOUTFILE) 
-install-pre-header:$(XMLOUTFILE) 
+#install-header:$(XMLOUTFILE)
+install-pre-header:$(XMLOUTFILE)
 
 #TOPFILE
 top.xml:$(XMLFILETOP)
@@ -80,7 +80,7 @@ agl_thread_tm.h:$(WAKESHUTCONF_DIR)/agl_thread_tm.h
 tskm_launch.xml:$(WAKESHUTCONF_DIR)/tskm_launch.xml agl_thread_tm.h
        $(HOST_CPP) -P -include agl_thread_tm.h $< > $@
 
-$(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES) 
+$(XMLOUTFILE):top.xml $(PARSEXMLCMD) $(CONFIG_FILES)
        $(XMLCHECKER) $(XMLCHECKEROPT) $<
        ./$(PARSEXMLCMD) $<
 
@@ -88,4 +88,3 @@ $(PARSEXMLCMD):$(PARSEXMLCMD).c
        $(HOSTCC) -o $@ $< -lexpat
 
 include ../../../system_service.mk
-