[Libreoffice-commits] .: readlicense_oo/makefile.mk readlicense_oo/prj

[Michael Meeks]

 readlicense_oo/makefile.mk |   16 +++++++++-------
 readlicense_oo/prj/d.lst   |   18 ++++--------------
 2 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit a62360c3b9f3d6516a4a66331bea9e767dfb5939
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Dec 8 20:48:37 2010 +0000

    get the rule names right, and cleanup delivery

diff --git a/readlicense_oo/makefile.mk b/readlicense_oo/makefile.mk
index dcbafb0..0b41cff 100755
--- a/readlicense_oo/makefile.mk
+++ b/readlicense_oo/makefile.mk
@@ -22,7 +22,9 @@ fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(forea
 .INCLUDE: target.mk
 # ------------------------------------------------------------------
 
-ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics
+ALLTAR: $(SOURCELICENCES) $(fallbacklicenses) just_for_nice_optics \
+        $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
+        $(MISC)$/THIRDPARTYLICENSEREADME.html
 
 .IF "$(fallbacklicenses)"!=""
 $(fallbacklicenses) : $(SOURCELICENCES)
@@ -47,9 +49,9 @@ $(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
     $(COPY) $< $@
 
 # just copy into misc
-$(MISC)$/LICENSE.odt: LICENSE.odt
-    $(COPY) LICENSE.odt $@
-$(MISC)$/CREDITS.odt: CREDITS.odt
-    $(COPY) CREDITS.odt $@
-$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
-    $(COPY) THIRDPARTYLICENSEREADME.html $@
+$(MISC)$/LICENSE.odt: odt/LICENSE.odt
+    $(COPY) odt/LICENSE.odt $@
+$(MISC)$/CREDITS.odt: odt/CREDITS.odt
+    $(COPY) odt/CREDITS.odt $@
+$(MISC)$/THIRDPARTYLICENSEREADME.html: html/THIRDPARTYLICENSEREADME.html
+    $(COPY) html/THIRDPARTYLICENSEREADME.html $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index aa771c5..deb1c94 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -4,30 +4,20 @@ mkdir: %_DEST%\pck%_EXT%
 dos: echo =====================================================================
 dos: echo Delivering LICENSE files
 dos: echo =====================================================================
-
-# Can we finally unify Windows and unx file names to upper case
-# LICENSE/LICENSE.html?
-# FIXME: is - can you solve this?
 ..\%__SRC%\misc\license\unx\LICENSE* %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\unx\LICENSE*.html %_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\wnt\license*.html %_DEST%\bin%_EXT%\osl
-..\%__SRC%\misc\license\wnt\license*.rtf %_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_en-US %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license_en-US.txt %_DEST%\bin%_EXT%\ure\LICENSE
-..\%__SRC%\misc\license\wnt\license_en-US.rtf %_DEST%\bin%_EXT%\ure\license_en-US.rtf
+..\%__SRC%\misc\license\unx\LICENSE %_DEST%\bin%_EXT%\ure\LICENSE
+..\%__SRC%\misc\license\wnt\license.txt %_DEST%\bin%_EXT%\ure\license.txt
 
-# RTF only for Windows?
-# Why? It comes from cws_src680_langsupporter.
 ..\%__SRC%\misc\THIRDPARTYLICENSEREADME.html %_DEST%\bin%_EXT%\THIRDPARTYLICENSEREADME.html
 
-..\%__SRC%\misc\LICENSE.odt %_DEST%\bin%_EXT%\LICENSE.odt
-..\%__SRC%\misc\CREDITS.odt %_DEST%\bin%_EXT%\CREDITS.odt
 
 dos: echo =====================================================================
 dos: echo Delivering README files