summaryrefslogtreecommitdiff
path: root/jmake
diff options
context:
space:
mode:
authorrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2008-01-04 23:14:00 +0000
committerrmanfredi <rmanfredi@2592e710-e01b-42a5-8df0-11608a6cc53d>2008-01-04 23:14:00 +0000
commit80f66fdd1d400ef2d592680beec4871e4e023b95 (patch)
tree64777fbe1a0b811e9a8ffb66231b2b3966e59608 /jmake
parent77e08c92c85470ea1e3754effce85283ca25a41d (diff)
Applied diff from H.Merijn Brand to keep it working with perl 5.10, which
no longer supports the old $* perl4 variable to request multiline matching. git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@20 2592e710-e01b-42a5-8df0-11608a6cc53d
Diffstat (limited to 'jmake')
-rwxr-xr-xjmake/jmake.SH6
1 files changed, 2 insertions, 4 deletions
diff --git a/jmake/jmake.SH b/jmake/jmake.SH
index 3f676b2..bdb5de7 100755
--- a/jmake/jmake.SH
+++ b/jmake/jmake.SH
@@ -143,13 +143,11 @@ while (<CPP>) {
s/@!\s?/\n/g;
s/@@\s?/\n\t/g;
- $* = 1;
# A '\r' is added to all lines, in order to let 'split' keep them
# As lines ending with '\' won't fit in the next regular
# expression (why ?), we have to treat that special case separately
- s/\n$/\r\n/g;
- s/\\\s*$/\\\r/g; # Remove spaces after final '\' and add '\r'
- $* = 0;
+ s/\n$/\r\n/gm;
+ s/\\\s*$/\\\r/gm; # Remove spaces after final '\' and add '\r'
@macro = split(/\n/);
for ($i = 0; $i <= $#macro; $i++) {
chop($_ = $macro[$i]); # Remove final '\r'