Fix desktop packaging.

configs/desktop/additional_steps.cmake

@@ -52,7 +52,7 @@ if(ENABLE_PACKAGING)
 			DEPENDS TARGET_linphone_builder
 			TMP_DIR ${ep_tmp}
 			BINARY_DIR ${ep_build}
-			SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/linphone_package"
+			SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package"
 			DOWNLOAD_COMMAND ""
 			CMAKE_GENERATOR ${CMAKE_GENERATOR}
 			CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DOPENH264_VERSION=${EP_openh264_VERSION}
@@ -66,7 +66,7 @@ if(ENABLE_PACKAGING)
 			DEPENDS TARGET_linphone_builder
 			TMP_DIR ${ep_tmp}
 			BINARY_DIR ${ep_build}
-			SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/desktop/ms2_package"
+			SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/ms2_package"
 			DOWNLOAD_COMMAND ""
 			CMAKE_GENERATOR ${CMAKE_GENERATOR}
 			CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DMS2_SOURCE_DIR=${EP_ms2_SOURCE_DIR} ${ENABLE_VARIABLES}

configs/desktop/linphone_package/CMakeLists.txt

@@ -47,7 +47,7 @@ set(PACKAGE_VERSION "${LINPHONE_VERSION}")
 set(LINPHONE_SDK_TMP "${CMAKE_CURRENT_BINARY_DIR}/linphone-sdk-tmp")
 file(REMOVE_RECURSE "${LINPHONE_SDK_TMP}")
 file(COPY "${LINPHONE_OUTPUT_DIR}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-file(RENAME "${CMAKE_CURRENT_BINARY_DIR}/OUTPUT" "${LINPHONE_SDK_TMP}")
+file(RENAME "${CMAKE_CURRENT_BINARY_DIR}/desktop" "${LINPHONE_SDK_TMP}")
 if(APPLE)
 	set(RPATH_CHANGE_CMDS
 		-change /opt/local/lib/libintl.8.dylib @rpath/libintl.8.dylib