summaryrefslogtreecommitdiff
path: root/instsetoo_native/util/openoffice.lst.in
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-30 21:28:09 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-31 10:42:24 +0100
commitfa424af27e8fd00528aea6ae4377184557a3a160 (patch)
tree254c07b10d5dada0c1bc77cfb88d4e147dbe9fc0 /instsetoo_native/util/openoffice.lst.in
parent6cf65f96123772565b76898dc6892f692696e673 (diff)
readlicense_oo: stop delivering files to OUTDIR
- remove Package_readme, use generated files from WORKDIR via include path - Package_license and Package_files deliver to INSTDIR - split up Package_odk_shared_readme to have extra Package for generated files - gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
Diffstat (limited to 'instsetoo_native/util/openoffice.lst.in')
-rw-r--r--instsetoo_native/util/openoffice.lst.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 68febd52a437..99da91074e6d 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},{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}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{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},{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}
+ include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{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}
}
}