From 8961c68788246c239ef325ccf6fd3e73bd388437 Mon Sep 17 00:00:00 2001
From: ronie <ronie@users.noreply.github.com>
Date: Wed, 26 Oct 2016 21:43:19 +0200
Subject: update build files

---
 Makefile.in                                    | 4 +++-
 project/Win32BuildSetup/BuildSetup.bat         | 3 ++-
 project/cmake/installdata/ios/packaging.txt    | 1 +
 project/cmake/installdata/osx/packaging.txt    | 1 +
 project/cmake/scripts/linux/Install.cmake      | 4 ++++
 tools/android/packaging/Makefile.in            | 1 +
 tools/darwin/Support/CopyRootFiles-ios.command | 1 +
 tools/darwin/Support/CopyRootFiles-osx.command | 1 +
 8 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 58b3a17e0a..ad7498352d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -522,7 +522,9 @@ install-scripts:
 install-datas: install-scripts
 	@echo "Copying support and legal files..."
 	@install -d $(DESTDIR)$(docdir)
-	@install -m 0644 docs/README.linux LICENSE.GPL *.txt $(DESTDIR)$(docdir)
+	@install -m 0644 docs/README.linux LICENSE.GPL copying.txt version.txt $(DESTDIR)$(docdir)
+	@install -d $(DESTDIR)/$(datarootdir)/@APP_NAME_LC@
+	@install -m 0644 privacy-policy.txt $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
 	@echo "Done!"
 	@echo "Copying system files to $(DESTDIR)$(datarootdir)/@APP_NAME_LC@"
 	@install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat
index 2f26ea2464..3b0b64febe 100644
--- a/project/Win32BuildSetup/BuildSetup.bat
+++ b/project/Win32BuildSetup/BuildSetup.bat
@@ -161,8 +161,9 @@ set WORKSPACE=%CD%\..\..\kodi-build
   xcopy %EXE% BUILD_WIN32\application > NUL
   xcopy %D3D% BUILD_WIN32\application > NUL
   xcopy %base_dir%\userdata BUILD_WIN32\application\userdata /E /Q /I /Y /EXCLUDE:exclude.txt > NUL
-  copy %base_dir%\copying.txt BUILD_WIN32\application > NUL
   copy %base_dir%\LICENSE.GPL BUILD_WIN32\application > NUL
+  copy %base_dir%\copying.txt BUILD_WIN32\application > NUL
+  copy %base_dir%\privacy-policy.txt BUILD_WIN32\application > NUL
   copy %base_dir%\known_issues.txt BUILD_WIN32\application > NUL
   xcopy dependencies\*.* BUILD_WIN32\application /Q /I /Y /EXCLUDE:exclude.txt  > NUL
 
diff --git a/project/cmake/installdata/ios/packaging.txt b/project/cmake/installdata/ios/packaging.txt
index a4c7a1f1cb..ce990b5bb7 100644
--- a/project/cmake/installdata/ios/packaging.txt
+++ b/project/cmake/installdata/ios/packaging.txt
@@ -1,2 +1,3 @@
 LICENSE.gpl
+privacy-policy.txt
 xbmc/platform/darwin/Credits.html
diff --git a/project/cmake/installdata/osx/packaging.txt b/project/cmake/installdata/osx/packaging.txt
index 8cb2245f38..f869e4c146 100644
--- a/project/cmake/installdata/osx/packaging.txt
+++ b/project/cmake/installdata/osx/packaging.txt
@@ -1,3 +1,4 @@
 LICENSE.gpl
+privacy-policy.txt
 xbmc/platform/darwin/Credits.html
 tools/darwin/packaging/media/osx/icon.iconset/*
diff --git a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake
index 5b2e3df402..5458707322 100644
--- a/project/cmake/scripts/linux/Install.cmake
+++ b/project/cmake/scripts/linux/Install.cmake
@@ -132,6 +132,10 @@ install(FILES ${CORE_SOURCE_DIR}/copying.txt
         DESTINATION ${datarootdir}/doc/${APP_NAME_LC}
         COMPONENT kodi)
 
+install(FILES ${CORE_SOURCE_DIR}/privacy-policy.txt
+        DESTINATION ${datarootdir}/${APP_NAME_LC}
+        COMPONENT kodi)
+
 # Install kodi-tools-texturepacker
 install(PROGRAMS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/texturepacker/TexturePacker
         DESTINATION ${bindir}
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 992c9f36e1..5bb7fe30ff 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -94,6 +94,7 @@ shared:
 	cd `pwd`/assets/addons; rm -rf $(EXCLUDED_ADDONS)
 	mkdir -p assets/system/certs
 	cp $(CORE_SOURCE_DIR)/tools/depends/target/openssl/cacert.pem assets/system/certs
+	cp $(CORE_SOURCE_DIR)/privacy-policy.txt assets
 
 sharedapk: shared | xbmc/assets
 	cp -rfp assets/* ./xbmc/assets
diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command
index 97810909af..06da0c7867 100755
--- a/tools/darwin/Support/CopyRootFiles-ios.command
+++ b/tools/darwin/Support/CopyRootFiles-ios.command
@@ -33,6 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media"
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime"
 
 ${SYNC} "$SRCROOT/LICENSE.GPL"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
+${SYNC} "$SRCROOT/privacy-policy.txt"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
 ${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/"
 ${ADDONSYNC} "$SRCROOT/addons"  "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
 ${SYNC} "$SRCROOT/media"    "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome"
diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command
index c59354cdde..0d1d480800 100755
--- a/tools/darwin/Support/CopyRootFiles-osx.command
+++ b/tools/darwin/Support/CopyRootFiles-osx.command
@@ -29,6 +29,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darw
 mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user"
 
 ${SYNC} "$SRCROOT/LICENSE.GPL" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
+${SYNC} "$SRCROOT/privacy-policy.txt" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
 ${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" 	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/"
 ${SYNC} "$SRCROOT/tools/darwin/runtime"	"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin"
 ${ADDONSYNC} "$SRCROOT/addons"		"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME"
-- 
cgit v1.2.3