diff options
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 7 | ||||
| -rw-r--r-- | xmlhelp/Module_xmlhelp.mk | 2 | ||||
| -rw-r--r-- | xmlhelp/Package_helpxsl.mk (renamed from xmlhelp/Zip_helpxsl.mk) | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 90b04d4e616c..00f1a94e64a4 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -350,9 +350,10 @@ End STD_RES_FILE( gid_File_Res_Eps, eps ) File gid_File_Help_Help_Zip - Dir = gid_Dir_Help; - ARCHIVE_TXT_FILE_BODY; - Name = "helpxsl.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "xmlhelp_helpxsl.filelist"; End #if defined WITH_HELP diff --git a/xmlhelp/Module_xmlhelp.mk b/xmlhelp/Module_xmlhelp.mk index 24390ea8e704..5e5105d21bbf 100644 --- a/xmlhelp/Module_xmlhelp.mk +++ b/xmlhelp/Module_xmlhelp.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,xmlhelp,\ Library_tvhlp1 \ Library_ucpchelp1 \ Package_xsl \ - Zip_helpxsl \ + Package_helpxsl \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/xmlhelp/Zip_helpxsl.mk b/xmlhelp/Package_helpxsl.mk index 8e10a803108f..ca862769e5e2 100644 --- a/xmlhelp/Zip_helpxsl.mk +++ b/xmlhelp/Package_helpxsl.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,helpxsl,$(SRCDIR)/xmlhelp/util)) +$(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util)) -$(eval $(call gb_Zip_add_files,helpxsl,\ +$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,help,\ idxcaption.xsl \ idxcontent.xsl \ main_transform.xsl \ |