mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

padmin: let Package deliver to $INSTDIR

Browse Source 
Change-Id: I824179f2040df917544c253712eb3afe19ec9fb1
This commit is contained in:
Michael Stahl
2013-04-23 23:19:18 +02:00
parent 954d695827
commit 59dbfa41d3
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
padmin/Module_padmin.mk
View File

@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,padmin,\
Executable_spadmin.bin \ Executable_spadmin.bin \
Library_spa \ Library_spa \
AllLangResTarget_spa \ AllLangResTarget_spa \
Package_inc \ Package_padmin \
UIConfig_spa \ UIConfig_spa \
)) ))
endif endif

7
padmin/Package_inc.mk → padmin/Package_padmin.mk
View File

@@ -17,7 +17,10 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # 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_Package,padmin,$(SRCDIR)/padmin/source))
$(eval $(call gb_Package_add_file,padmin_src,bin/spadmin,spadmin.sh))
$(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: # vim: set noet sw=4 ts=4:

6
scp2/source/ooo/common_brand.scp
View File

@@ -500,9 +500,9 @@ End
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_Brand_File_Bin_Spadmin File gid_Brand_File_Bin_Spadmin
BIN_FILE_BODY; BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program; Dir = FILELIST_DIR;
Name = "spadmin"; Name = "padmin.filelist";
Styles = (PACKED); Styles = (PACKED, FILELIST);
End End
#endif #endif