further simplification of license build / installation

This commit is contained in:
Michael Meeks 2010-12-09 11:49:52 +00:00 committed by Fridrich Štrba
parent 0b2f2ea5d5
commit 4018811617
2 changed files with 11 additions and 26 deletions

View file

@ -6,23 +6,11 @@ TARGET=source
.INCLUDE: settings.mk
# ------------------------------------------------------------------
.IF "$(GUI)"=="WNT"
SYSLICBASE=license.txt LICENSE.odt
SYSLICDEST=$(MISC)$/license$/wnt
.ELSE # "$(GUI)"=="WNT"
SYSLICBASE=LICENSE LICENSE.odt
SYSLICDEST=$(MISC)$/license$/unx
.ENDIF # "$(GUI)"=="WNT"
SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)$(i:e))
fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
# ------------------------------------------------------------------
.INCLUDE: target.mk
# ------------------------------------------------------------------
ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics \
ALLTAR: $(MISC)/$/license.txt $(MISC)/$/LICENSE \
$(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
$(MISC)$/THIRDPARTYLICENSEREADME.html
@ -36,16 +24,13 @@ just_for_nice_optics: $(fallbacklicenses)
@$(ECHONL)
# for windows, convert linends to DOS
$(SYSLICDEST)$/license.% : txt$/license.%
@-$(MKDIRHIER) $(SYSLICDEST)
$(MISC)$/license.txt : txt$/license.txt
$(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
# for others just copy
$(SYSLICDEST)$/LICENSE : txt$/license.txt
@-$(MKDIRHIER) $(SYSLICDEST)
$(MISC)$/LICENSE : txt$/license.txt
$(COPY) $< $@
$(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
@-$(MKDIRHIER) $(SYSLICDEST)
$(MISC)$/SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
$(COPY) $< $@
# just copy into misc

View file

@ -4,17 +4,17 @@ mkdir: %_DEST%\pck%_EXT%
dos: echo =====================================================================
dos: echo Delivering LICENSE files
dos: echo =====================================================================
..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\unx\LICENSE*.odt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\LICENSE*.odt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license\wnt\license*.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\osl
..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
# URE:
mkdir: %_DEST%\bin%_EXT%\ure
..\%__SRC%\misc\license\unx\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license\wnt\license.txt %_DEST%\bin%_EXT%\ure\license.txt
..\%__SRC%\misc\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
..\%__SRC%\misc\license.txt %_DEST%\bin%_EXT%\ure\license.txt
..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html