diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-04-28 15:20:46 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-28 14:33:26 +0000 |
| commit | 9ed5affa51257e1bfece7fd8712acad77ad64cad (patch) | |
| tree | 529fb19dc2414064bf87aed305023cc9571233d5 | |
| parent | 2c04d86f692d4b0841adba508a21e63e1bcdc45f (diff) | |
fdo#63197: convert fontunxafm
Change-Id: Ib382319a4916b711c820c06ba57928ca11d0b804
Reviewed-on: https://gerrit.libreoffice.org/3648
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | afms/ExternalPackage_fontunxafm.mk (renamed from afms/Zip_fontunxafm.mk) | 8 | ||||
| -rw-r--r-- | afms/Module_afms.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 6 |
3 files changed, 7 insertions, 9 deletions
diff --git a/afms/Zip_fontunxafm.mk b/afms/ExternalPackage_fontunxafm.mk index 058ee7e479fe..d2600a1d9bb8 100644 --- a/afms/Zip_fontunxafm.mk +++ b/afms/ExternalPackage_fontunxafm.mk @@ -7,13 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,fontunxafm,$(call gb_UnpackedTarball_get_dir,afms))) +$(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms)) -$(eval $(call gb_Zip_add_dependencies,fontunxafm,\ - $(call gb_UnpackedTarball_get_target,afms) \ -)) +$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTDIR))) -$(eval $(call gb_Zip_add_files,fontunxafm,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,share/psprint/fontmetric,\ Courier-Bold.afm \ Courier-BoldOblique.afm \ Courier-Oblique.afm \ diff --git a/afms/Module_afms.mk b/afms/Module_afms.mk index ee04aa9de651..5e0c75052272 100644 --- a/afms/Module_afms.mk +++ b/afms/Module_afms.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,afms)) $(eval $(call gb_Module_add_targets,afms,\ UnpackedTarball_afms \ - Zip_fontunxafm \ + ExternalPackage_fontunxafm \ )) # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 93ebc12ce39d..0a804d3c8f50 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -208,10 +208,10 @@ End #ifndef WITHOUT_AFMS File gid_File_Extra_Fontunxafm - Dir = gid_Dir_Psprint_Fontmetric; + Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (ARCHIVE); - Name = "fontunxafm.zip"; + Styles = (FILELIST); + Name = "afms_fontunxafm.filelist"; End #endif |