Fix for 64 bit compatibility.

- Fix hardcoding path.
- Use %cmake to set default paths.

Change-Id: I2969661573e38a4bcc2a939fa2d4c839d73ed043

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01972db..315d1cf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ SET_TARGET_PROPERTIES(${this_target}
        CLEAN_DIRECT_OUTPUT 1
        )
 
-INSTALL(TARGETS ${this_target} DESTINATION lib
+INSTALL(TARGETS ${this_target} DESTINATION ${LIB_INSTALL_DIR}
                                PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ                      
                     GROUP_EXECUTE GROUP_READ
                     WORLD_EXECUTE WORLD_READ)

diff --git a/packaging/osp-env-config.spec b/packaging/osp-env-config.spec
index 9a5602d..1bc56fa 100755 (executable)
--- a/packaging/osp-env-config.spec
+++ b/packaging/osp-env-config.spec
@@ -19,10 +19,10 @@ osp application environment cofiguration serivce
 
 %build 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%ifarch %{ix86}
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%ifarch %{ix86} x86_64
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" %cmake .
 %else
-CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" %cmake .
 %endif
 
 # Call make instruction with smp support