summaryrefslogtreecommitdiff
path: root/readlicense_oo
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2010-11-26 17:50:29 +0100
committerRene Engelhard <rene@debian.org>2010-11-26 17:50:29 +0100
commit299359d0b860d87498729693bfd8fbcb4341496f (patch)
tree8bf3c191701406abc92b2d36eb7aab8c2ba06d55 /readlicense_oo
parent6c3199bfcb468b6158c1692ec88e961129962352 (diff)
parent2dda128c4063a124cbbecdeecd34e4b11a927657 (diff)
Merge branch 'libreoffice-3-3'
Diffstat (limited to 'readlicense_oo')
-rw-r--r--readlicense_oo/odt/makefile.mk4
-rw-r--r--readlicense_oo/prj/d.lst1
2 files changed, 4 insertions, 1 deletions
diff --git a/readlicense_oo/odt/makefile.mk b/readlicense_oo/odt/makefile.mk
index 1e68a1722ef5..89cea1a3dc08 100644
--- a/readlicense_oo/odt/makefile.mk
+++ b/readlicense_oo/odt/makefile.mk
@@ -36,7 +36,7 @@ TARGET=odt
# --- Files --------------------------------------------------------
-all: $(MISC)$/LICENSE.odt
+all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
# --- Targets ------------------------------------------------------
@@ -44,3 +44,5 @@ all: $(MISC)$/LICENSE.odt
$(MISC)$/LICENSE.odt: LICENSE.odt
$(COPY) LICENSE.odt $@
+$(MISC)$/CREDITS.odt: CREDITS.odt
+ $(COPY) CREDITS.odt $@
diff --git a/readlicense_oo/prj/d.lst b/readlicense_oo/prj/d.lst
index 2a368beb7888..aa771c50111f 100644
--- a/readlicense_oo/prj/d.lst
+++ b/readlicense_oo/prj/d.lst
@@ -27,6 +27,7 @@ mkdir: %_DEST%\bin%_EXT%\ure
..\%__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