From 7b3133ad882b24834f87b478d00bf4ee92d3cd63 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 7 Nov 2013 12:58:33 +0100 Subject: instsetoo_native: shouldn't need instdir in include path get_Source_Directory_For_Files_From_Includepathlist already has a special hack to find all the files in instdir so ideally it should not be necessary to put these directories on the include path. Clean up readlicense_oo to make that possible; also copying license.txt as-is to LICENSE on Unix but first converting it on WNT is rather silly... Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c Reviewed-on: https://gerrit.libreoffice.org/6613 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- instsetoo_native/util/openoffice.lst.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'instsetoo_native/util/openoffice.lst.in') diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 941601f72014..0b07ebd9d897 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 {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{instdir},{instdir}/LibreOffice.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath} + include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{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 {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{instdir},{instdir}/LibreOffice_Dev.app/Contents,{instdir}/ure/lib,{extensionsdir},{packinfopath} + include {installscriptdir},{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native,{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{filelistpath}/ExtensionPackage,{extensionsdir},{licensepath},{packinfopath} } } @@ -170,7 +170,7 @@ LibreOffice_SDK active 1 compression 5 script sdkoo - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath} + include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} } } @@ -216,6 +216,6 @@ LibreOffice_Dev_SDK active 1 compression 5 script sdkoo - include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{instdir},{instdir}/ure/lib,{packinfopath} + include {installscriptdir},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{licensepath},{packinfopath} } } -- cgit