X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=agl-basefiles%2Fshare%2Fagl.mk;h=cde65cc17c99b1a12aa693960c1e1b110084f76a;hb=refs%2Fchanges%2F30%2F25630%2F1;hp=d8de6189af61739b3f3732aeb4c6c99c5ec6da06;hpb=604011e21f44b51f3540711ffe53a16362796ae5;p=staging%2Fbasesystem.git

diff --git a/agl-basefiles/share/agl.mk b/agl-basefiles/share/agl.mk
index d8de618..cde65cc 100644
--- a/agl-basefiles/share/agl.mk
+++ b/agl-basefiles/share/agl.mk
@@ -203,7 +203,7 @@ AGLCPPFLAGS += -DAGL_PosixBasedOS001LEGACY_USED -DAGL_STUB -DLINUX
 AGLCPPFLAGS += -I$(SYSROOT)/usr/include/basesystem
 
 ## for agl library##
-AGLLDFLAGS += -L$(SYSROOT)/usr/agl/lib
+AGLLDFLAGS += -L$(SYSROOT)/usr/lib/basesystem
 
 ifneq ($(INST_SHLIBS),libagl_stub)
 AGLLDLIBS += -Wl,-Bdynamic -lpthread
@@ -215,7 +215,7 @@ endif
 COMPONENT_NAME ?= $(error COMPONENT_NAME is not defined)
 AGL_TOPDIR ?= $(DESTDIR)/usr
 AGL_INCDIR := $(AGL_TOPDIR)/include/basesystem
-AGL_LIBDIR := $(AGL_TOPDIR)/lib
+AGL_LIBDIR := $(AGL_TOPDIR)/lib/basesystem
 AGL_BINDIR := $(AGL_TOPDIR)/bin
 AGL_PIXMAPDIR := $(AGL_TOPDIR)/pixmaps
 AGL_UCODEDIR := $(AGL_TOPDIR)/data/ucode
@@ -331,7 +331,7 @@ endif
 
 #################################################################################
 
-RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/agl/lib
+RPATHLINK := $(SYSROOT)/usr/lib:$(SYSROOT)/lib:$(SYSROOT)/usr/lib/basesystem
 
 #################################################################################
 SUBDIRS := $(filter-out mock,$(SUBDIRS))
@@ -444,7 +444,8 @@ ifneq ($(strip $(INST_HEADERS)),)
 endif
 
 
-HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/agl/share/launch_xml2cfg.sh
+
+HOST_LAUNCH_XML2CFG = $(SYSROOT)/usr/share/basesystem/launch_xml2cfg.sh
 CONF_H = $(SYSROOT)/usr/include/basesystem/sm_launch_conf.h
 
 %.cfg: %.xml