[ioquake3] 24/33: Fix compiling GLSL shaders under Windows.

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 96f94a2891eeaa4b486de2c174ed8c00fcf0d271
Author: Walter Barrett <WalterBarrett at users.noreply.github.com>
Date:   Sat Oct 7 00:23:34 2017 -0400

    Fix compiling GLSL shaders under Windows.
    
    Now the `sed` command cope with files using Windows-style line endings.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 464ad3c..de2b352 100644
--- a/Makefile
+++ b/Makefile
@@ -1183,7 +1183,7 @@ define DO_REF_STR
 $(echo_cmd) "REF_STR $<"
 $(Q)rm -f $@
 $(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@
-$(Q)cat $< | sed 's/^/\"/;s/$$/\\n\"/' >> $@
+$(Q)cat $< | sed -e 's/^/\"/;s/$$/\\n\"/' -e 's/\r//g' >> $@
 $(Q)echo ";" >> $@
 endef
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git