Fix the path to the architecture-independent data

Fix the path to the architecture-independent data,
'/usr/agl/share' to follow the standard, '/usr/share'
and add subsystem name 'basesystem' for agl-basesystem.

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I9a547474a738ebbbbabc7eb8441ccbf3a2d3f6e0

7 files changed, 11 insertions, 11 deletions

diff --git a/service/native/native_service.mk b/service/native/native_service.mk
index 729362c..74daaf0 100755
--- a/service/native/native_service.mk
+++ b/service/native/native_service.mk
@@ -41,4 +41,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk
+include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
diff --git a/service/other/other_service.mk b/service/other/other_service.mk
index 85a2f2c..63a03ab 100755
--- a/service/other/other_service.mk
+++ b/service/other/other_service.mk
@@ -39,4 +39,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk
+include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
diff --git a/service/peripheral/peripheral_service.mk b/service/peripheral/peripheral_service.mk
index c054722..561c241 100755
--- a/service/peripheral/peripheral_service.mk
+++ b/service/peripheral/peripheral_service.mk
@@ -41,4 +41,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk
+include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
diff --git a/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
index 16ec02a..0459af1 100755
--- a/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
+++ b/service/system/config/library/system_manager_config/src/ss_system_manager_conf.cpp
@@ -301,7 +301,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) {
     SS_ASERT(configRet == eFrameworkunifiedStatusOK);
 
     // Set PRODUCT version information
-    const char prdVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/version.txt";
+    const char prdVersion[] = "/usr/share/basesystem/BS/ss/system_manager/rodata/version.txt";
     {
       std::string line;
       std::ifstream prdFin(prdVersion);
@@ -327,7 +327,7 @@ static EFrameworkunifiedStatus setVersionInfo(void) {
     }
 
     // PHASE_INFO
-    const char phaseVersion[] = "/usr/agl/share/BS/ss/system_manager/rodata/PhaseInfo.txt";
+    const char phaseVersion[] = "/usr/share/basesystem/BS/ss/system_manager/rodata/PhaseInfo.txt";
     {
       configRet = setVerInfo_version_date(phaseVersion);
     }
diff --git a/service/system/system_manager/server/Makefile b/service/system/system_manager/server/Makefile
index b518c2e..6d13bb7 100755
--- a/service/system/system_manager/server/Makefile
+++ b/service/system/system_manager/server/Makefile
@@ -107,12 +107,12 @@ install-data: install_data
 
 install_data:
 	cpp -P -include $(SDKTARGETSYSROOT)/usr/include/basesystem/agl_thread.h ./sm_launch__CWORD84_.xml ./sm_launch.tmp.xml
-	$(SDKTARGETSYSROOT)/usr/agl/share/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg
+	$(SDKTARGETSYSROOT)/usr/share/basesystem/launch_xml2cfg.sh ./sm_launch.tmp.xml > ./sm_launch.cfg
 	install -d -m 755 $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
 	install -m 644 ./sm_launch.cfg $(DESTDIR)/usr/agl/conf/BS/ss/system_manager/rwdata
 	install -d -m 755 $(DESTDIR)/nv/BS/ss/system_manager/rwdata
-	install -d -m 755 $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata
-	install -m 644 ./version.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata
-	install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/agl/share/BS/ss/system_manager/rodata
+	install -d -m 755 $(DESTDIR)/usr/share/basesystem/BS/ss/system_manager/rodata
+	install -m 644 ./version.txt $(DESTDIR)/usr/share/basesystem/BS/ss/system_manager/rodata
+	install -m 644 ./PhaseInfo.txt $(DESTDIR)/usr/share/basesystem/BS/ss/system_manager/rodata
 
 include ../../system_service.mk
diff --git a/service/system/system_service.mk b/service/system/system_service.mk
index 5444eb4..c1aa32c 100755
--- a/service/system/system_service.mk
+++ b/service/system/system_service.mk
@@ -41,4 +41,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk
+include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk
diff --git a/service/vehicle/vehicle_service.mk b/service/vehicle/vehicle_service.mk
index 40d337f..8e753fb 100755
--- a/service/vehicle/vehicle_service.mk
+++ b/service/vehicle/vehicle_service.mk
@@ -39,4 +39,4 @@ COMPONENT_LDFLAGS :=
  
 ##############################################################
  
-include $(SDKTARGETSYSROOT)/usr/agl/share/agl.mk
+include $(SDKTARGETSYSROOT)/usr/share/basesystem/agl.mk