setup_native: remove Package_scripts_generated

... instead add an include path to the installer.

Change-Id: I5650d5d1d84620a04a9a92825733f3927da2053d

3 files changed, 2 insertions, 28 deletions

diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 94675741f334..68febd52a437 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -78,7 +78,7 @@ LibreOffice
         downloadname    LibreOffice_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOffice_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOffice_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
     }
 }
 
@@ -131,7 +131,7 @@ LibreOffice_Dev
         downloadname    LibreOfficeDev_{productversion}_{os}_install_{languages}
         langpackdownloadname    LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
         helppackdownloadname    LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-        include         {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
+        include         {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath}
     }
 }
 
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 2e0c6ec5312a..4228ea88436a 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -57,7 +57,6 @@ endif
 $(eval $(call gb_Module_add_targets,setup_native,\
 	CustomTarget_scripts \
 	Package_scripts \
-	Package_scripts_generated \
 ))
 endif
 
diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk
deleted file mode 100644
index ef157310fc4b..000000000000
--- a/setup_native/Package_scripts_generated.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts)))
-
-$(eval $(call gb_Package_set_outdir,scripts_generated,$(OUTDIR)))
-
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
-endif
-
-ifeq ($(OS),LINUX)
-ifneq ($(filter rpm,$(PKGFORMAT)),)
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
-$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
-endif
-endif
-# vim: set noet sw=4 ts=4: