padmin: let Package deliver to $INSTDIR

Change-Id: I824179f2040df917544c253712eb3afe19ec9fb1

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

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:

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