fixed build on x86_64 and clean up CFLAGS

Change-Id: Ia55bf5c86ca10d69da059e735e8d6cbd60be210a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44f491eaa6e8b59fb37650fff0511eb921a9cabf..7bc3f5dbd24dcb605dfd64aa56651d0937964c6a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,8 +44,8 @@ TARGET_LINK_LIBRARIES(${APPCORE_COMMON} ${pkg_common_LDFLAGS} "-ldl")
 
 CONFIGURE_FILE(${APPCORE_COMMON}.pc.in ${APPCORE_COMMON}.pc @ONLY)
 
-INSTALL(TARGETS ${APPCORE_COMMON} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPCORE_COMMON}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${APPCORE_COMMON} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPCORE_COMMON}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 FOREACH(hfile ${HEADERS_common})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${hfile} DESTINATION include/appcore)
 ENDFOREACH(hfile)
@@ -72,8 +72,8 @@ TARGET_LINK_LIBRARIES(${APPCORE_EFL} ${pkg_efl_LDFLAGS} ${APPCORE_COMMON})
 
 CONFIGURE_FILE(${APPCORE_EFL}.pc.in ${APPCORE_EFL}.pc @ONLY)
 
-INSTALL(TARGETS ${APPCORE_EFL} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPCORE_EFL}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${APPCORE_EFL} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPCORE_EFL}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 FOREACH(hfile ${HEADERS_efl})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${hfile} DESTINATION include/appcore)
 ENDFOREACH(hfile)

diff --git a/packaging/app-core.spec b/packaging/app-core.spec
index 4c4c838bff7c956a7862e183e7f69fd7c5fe0339..10fd6e63ddcbaf25b7b200a6e41c06d17db8902f 100644 (file)
--- a/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@ -1,9 +1,8 @@
-
 Name:       app-core
 Summary:    Application basic
 Version:    1.2
 Release:    41
-Group:      TO_BE/FILLED_IN
+Group:      Application Framework
 License:    Apache License, Version 2.0
 Source0:    app-core-%{version}.tar.gz
 Source101:  packaging/core-efl.target
@@ -79,7 +78,7 @@ Application basics template
 %setup -q 
 
 %build
-CFLAGS="-I/usr/lib/glib-2.0/include/ -I/usr/include/glib-2.0 -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -I/usr/include/e_dbus-1 -I/usr/include/ethumb-0 -I/usr/include/edje-1 -I/usr/include/efreet-1 -I/usr/include/embryo-1 -I/usr/include/ecore-1 -I/usr/include/eet-1 -I/usr/include/evas-1 -I/usr/include/eina-1 -I/usr/include/eina-1/eina  $(CFLAGS)" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DENABLE_GTK=OFF
+%cmake . -DENABLE_GTK=OFF
 
 
 make %{?jobs:-j%jobs}
@@ -87,8 +86,8 @@ make %{?jobs:-j%jobs}
 %install
 rm -rf %{buildroot}
 %make_install
-install -d %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants
-install -m0644 %{SOURCE101} %{buildroot}%{_libdir}/systemd/user/
+install -d %{buildroot}%{_prefix}/lib/systemd/user/core-efl.target.wants
+install -m0644 %{SOURCE101} %{buildroot}%{_prefix}/lib/systemd/user/
 
 
 %post efl -p /sbin/ldconfig
@@ -118,8 +117,8 @@ install -m0644 %{SOURCE101} %{buildroot}%{_libdir}/systemd/user/
 %manifest app-core.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libappcore-common.so.*
-%{_libdir}/systemd/user/core-efl.target
-%{_libdir}/systemd/user/core-efl.target.wants/
+%{_prefix}/lib/systemd/user/core-efl.target
+%{_prefix}/lib/systemd/user/core-efl.target.wants/
 
 %files common-devel
 %defattr(-,root,root,-)