packaging: Change install path to /opt/data/hal-rootstrap and use rpm macro

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/copy_required_files.sh b/copy_required_files.sh
index 37bb76a460137ea4fb4efe86407cd24ba81cc8c9..4e4e34f536e631cbe9fbb6d0e2bb8f7e30c88649 100755 (executable)
--- a/copy_required_files.sh
+++ b/copy_required_files.sh
@@ -28,7 +28,7 @@ while [[ ${INDEX} -lt ${#XML_DIRECTORIES[@]} ]]; do
                else
                        NECESSARY_FILES=($(xmlstarlet sel -t -m "//necessary/file" -v "text()" -o " " -n ${ENTITY_PATH}))
                        for NECESSARY_FILE in ${NECESSARY_FILES[@]}; do
-                               THIS_COPY_DEST="${COPY_DEST}/opt/data/hal/${NECESSARY_FILE}"
+                               THIS_COPY_DEST="${COPY_DEST}/opt/data/hal-rootstrap${NECESSARY_FILE}"
                                THIS_COPY_DEST_PARENT=$(dirname ${THIS_COPY_DEST})
                                if [[ ! -d ${THIS_COPY_DEST_PARENT} ]]; then
                                        mkdir -p ${THIS_COPY_DEST_PARENT}

diff --git a/packaging/hal-rootstrap.pc.in b/packaging/hal-rootstrap.pc.in
index cf9b679af1b5424c3561380c9efe60b91eab7e49..47071bdea08e1da7837c407b3f1b708d5bc45a79 100644 (file)
--- a/packaging/hal-rootstrap.pc.in
+++ b/packaging/hal-rootstrap.pc.in
@@ -1,10 +1,10 @@
 # Package Information for pkg-config
 
 package_name=hal-rootstrap
-prefix=/opt/data/hal@PREFIX@
-exec_prefix=/opt/data/hal@EXEC_PREFIX@
-hal_rootstrap_libdir=/opt/data/hal/usr/lib
-hal_rootstrap_include_dir=/opt/data/hal/usr/include
+prefix=/opt/data/hal-rootstrap@PREFIX@
+exec_prefix=/opt/data/hal-rootstrap@EXEC_PREFIX@
+hal_rootstrap_libdir=/opt/data/hal-rootstrap@LIBDIR@
+hal_rootstrap_include_dir=/opt/data/hal-rootstrap@INCLUDEDIR@
 
 Name: ${package_name}
 Description: ${package_name} interface

diff --git a/packaging/hal-rootstrap.spec b/packaging/hal-rootstrap.spec
index 7995afc16ff87d87afb24e509c6361f48ee3a9ef..68ec244935b1d287bfe67a76ac583e9783ffd61c 100644 (file)
--- a/packaging/hal-rootstrap.spec
+++ b/packaging/hal-rootstrap.spec
@@ -421,7 +421,7 @@ Package for rootstrap of hal
 
 %prep
 %setup -q
-%cmake
+%cmake . -DCMAKE_LIBDIR_PREFIX=%{_libdir}
 
 %build
 make %{?jobs:-j%jobs}
@@ -435,10 +435,10 @@ mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 cp packaging/hal-rootstrap.pc %{buildroot}%{_libdir}/pkgconfig/
 
 %files
-/opt/data/hal/lib/*
-/opt/data/hal/usr/lib/*
+/opt/data/hal-rootstrap/lib/*
+/opt/data/hal-rootstrap/%{_libdir}/*
 
 %files -n %{devel_name}
 %defattr(-,root,root,-)
-/opt/data/hal/usr/include/*
+/opt/data/hal-rootstrap/%{_includedir}/*
 %{_libdir}/pkgconfig/*.pc