incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1309281 - /incubator/ooo/trunk/main/readlicense_oo/makefile.mk
Date Wed, 04 Apr 2012 08:16:59 GMT
Author: hdu
Date: Wed Apr  4 08:16:59 2012
New Revision: 1309281

URL: http://svn.apache.org/viewvc?rev=1309281&view=rev
Log:
use CR/LF lineends on LICENSE+NOTICE files on WNT+OS/2

Modified:
    incubator/ooo/trunk/main/readlicense_oo/makefile.mk

Modified: incubator/ooo/trunk/main/readlicense_oo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/makefile.mk?rev=1309281&r1=1309280&r2=1309281&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/makefile.mk (original)
+++ incubator/ooo/trunk/main/readlicense_oo/makefile.mk Wed Apr  4 08:16:59 2012
@@ -43,6 +43,12 @@ ALL_NOTICE=..$/NOTICE
 SUM_LICENSE=$(MISC)$/SUM_LICENSE
 SUM_NOTICE=$(MISC)$/SUM_NOTICE
 
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+    LINEEND_CAT=$(PERL) -p -e 's/\r?\n$$/\r\n/'
+.ELSE
+    LINEEND_CAT=cat
+.ENDIF
+
 # ------------------------------------------------------------------
 .INCLUDE: target.mk
 # ------------------------------------------------------------------
@@ -50,8 +56,8 @@ SUM_NOTICE=$(MISC)$/SUM_NOTICE
 ALLTAR: ${SUM_LICENSE} ${SUM_NOTICE}
 
 ${SUM_LICENSE} : ${ALL_LICENSE}
-    cat $< > $@
+    ${LINEEND_CAT} > $@ $<
 
 ${SUM_NOTICE} : ${ALL_NOTICE}
-    cat $< > $@
+    ${LINEEND_CAT} > $@ $<
 



Mime
View raw message