diff options
Diffstat (limited to 'liblangtag')
-rw-r--r-- | liblangtag/makefile.mk | 16 | ||||
-rw-r--r-- | liblangtag/prj/d.lst | 10 |
2 files changed, 16 insertions, 10 deletions
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk index a8efa55b7d12..cbb522cfb468 100644 --- a/liblangtag/makefile.mk +++ b/liblangtag/makefile.mk @@ -16,6 +16,9 @@ LIBLANGTAG_MINOR=2 LIBLANGTAG_MICRO=0 # Currently liblangtag.so.0.1.0 is generated instead of 0.2.0, presumably a bug? # For new versions adapt symlink in prj/d.lst +# Version is currently hardcoded in scp2/source/ooo/file_library_ooo.scp +# section gid_File_Lib_Langtag, adapt for new versions, or introduce +# LIBLANGTAG_M* in configure! # --- Settings ----------------------------------------------------- @@ -41,7 +44,11 @@ PATCH_FILES+=liblangtag-0.2-datadir.patch CONFIGURE_DIR=. BUILD_DIR=$(CONFIGURE_DIR) -CONFIGURE_FLAGS+= --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)$/install +my_misc='$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)' +my_prefix='$(my_misc)$/install' +my_data='$(my_prefix)$/share/liblangtag' + +CONFIGURE_FLAGS+= --prefix='$(my_prefix)' .IF "$(SYSTEM_LIBXML)"!="YES" CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external$/libxml' @@ -92,6 +99,13 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch # --- Targets ------------------------------------------------------ +ALLTAR: $(MISC)/liblangtag_data.zip + .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk + +$(MISC)/liblangtag_data.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) + @-rm -f $@ + @echo creating $@ + $(COMMAND_ECHO)cd $(my_data) && zip $(ZIP_VERBOSITY) -r $(my_misc)$/$(@:f) * diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst index 43e9c34c5512..c4c9a2372941 100644 --- a/liblangtag/prj/d.lst +++ b/liblangtag/prj/d.lst @@ -3,15 +3,7 @@ mkdir: %_DEST%\inc\liblangtag ..\%__SRC%\misc\install\include\liblangtag\* %_DEST%\inc\liblangtag\ ..\%__SRC%\misc\install\lib\liblangtag.so* %_DEST%\lib\ ..\%__SRC%\misc\install\lib\langtag.lib* %_DEST%\lib\ +..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\ symlink: %_DEST%\lib\liblangtag.so.0.1.0 %_DEST%\lib\liblangtag.so.0 symlink: %_DEST%\lib\liblangtag.so.0.1.0 %_DEST%\lib\liblangtag.so - -mkdir: %_DEST%\share -mkdir: %_DEST%\share\liblangtag -mkdir: %_DEST%\share\liblangtag\common -mkdir: %_DEST%\share\liblangtag\common\bcp47 - -..\%__SRC%\misc\install\share\liblangtag\* %_DEST%\share\liblangtag\ -..\%__SRC%\misc\install\share\liblangtag\common\* %_DEST%\share\liblangtag\common\ -..\%__SRC%\misc\install\share\liblangtag\common\bcp47\* %_DEST%\share\liblangtag\common\bcp47\ |