diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 21:28:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:24 +0100 |
| commit | fa424af27e8fd00528aea6ae4377184557a3a160 (patch) | |
| tree | 254c07b10d5dada0c1bc77cfb88d4e147dbe9fc0 /solenv/gbuild | |
| parent | 6cf65f96123772565b76898dc6892f692696e673 (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 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/mingw.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 96cfb5dbd7c3..7d4fc6c086fa 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -261,7 +261,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 55776b3be5ec..11aadc68547e 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -544,7 +544,7 @@ gb_CliAssemblyTarget_get_dll = $(call gb_Library__get_dir_for_layer,NONE)/$(1)$( # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt # UnpackedTarget class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 0389eedafdb1..8ccec37640f8 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -350,7 +350,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 29ac9c4f1df8..fb00181a717e 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -357,7 +357,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt # UnpackedTarget class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 295fce653b39..2115a4a90082 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -374,7 +374,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 81137a3d103c..75d5d21ab4d6 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -375,7 +375,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class |