diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-23 23:19:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-23 23:40:56 +0200 |
| commit | 59dbfa41d31822dd7ffde320bf43463be82fbfcb (patch) | |
| tree | 3135fe1a4b80b35a0f9baa55644c279321f59479 | |
| parent | 954d695827431a5badd1a993d8f364c669ca9c9c (diff) | |
padmin: let Package deliver to $INSTDIR
Change-Id: I824179f2040df917544c253712eb3afe19ec9fb1
| -rw-r--r-- | padmin/Module_padmin.mk | 2 | ||||
| -rw-r--r-- | padmin/Package_padmin.mk (renamed from padmin/Package_inc.mk) | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk index 9407b9794dfb..2b5e07b6d66d 100644 --- a/padmin/Module_padmin.mk +++ b/padmin/Module_padmin.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,padmin,\ Executable_spadmin.bin \ Library_spa \ AllLangResTarget_spa \ - Package_inc \ + Package_padmin \ UIConfig_spa \ )) endif diff --git a/padmin/Package_inc.mk b/padmin/Package_padmin.mk index 6c69229465c3..7a9dde1e7de5 100644 --- a/padmin/Package_inc.mk +++ b/padmin/Package_padmin.mk @@ -17,7 +17,10 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_Package_Package,padmin_src,$(SRCDIR)/padmin/source)) -$(eval $(call gb_Package_add_file,padmin_src,bin/spadmin,spadmin.sh)) +$(eval $(call gb_Package_Package,padmin,$(SRCDIR)/padmin/source)) + +$(eval $(call gb_Package_set_outdir,padmin,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,padmin,program/spadmin,spadmin.sh)) # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 0a6a52309d40..60024a7d1d31 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -500,9 +500,9 @@ End #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_Brand_File_Bin_Spadmin BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "spadmin"; - Styles = (PACKED); + Dir = FILELIST_DIR; + Name = "padmin.filelist"; + Styles = (PACKED, FILELIST); End #endif |