diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-12-09 11:49:52 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-09 11:49:52 +0000 |
| commit | 6c8beb7886306a0946d98209c5a7363d9b837f52 (patch) | |
| tree | 4fe0d0c9f80244cbc7dd67e239f81c805d89bfa7 /readlicense_oo | |
| parent | ba4dfeb67f846665779bf1524c23499616da61f2 (diff) | |
further simplification of license build / installation
Diffstat (limited to 'readlicense_oo')
| -rwxr-xr-x | readlicense_oo/makefile.mk | 25 | ||||
| -rw-r--r-- | readlicense_oo/prj/d.lst | 12 |
2 files changed, 11 insertions, 26 deletions
diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk index 0b41cfff85..ee1facd61d 100755 --- a/readlicense_oo/makefile.mk +++ b/readlicense_oo/makefile.mk @@ -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 diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst index deb1c94dc7..1739f6fa53 100644 --- a/readlicense_oo/prj/d.lst +++ b/readlicense_oo/prj/d.lst @@ -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 |