projects
/
autodist.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
472b9ed
)
Remove extra whitespace and tab when joining backslashed lines.
author
Pekka Riikonen
<priikone@silcnet.org>
Tue, 19 Apr 2005 17:19:39 +0000
(17:19 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Tue, 19 Apr 2005 17:19:39 +0000
(17:19 +0000)
apps/autodist/CHANGES
patch
|
blob
|
history
apps/autodist/autodist.in
patch
|
blob
|
history
apps/autodist/tests/autodist1.test
patch
|
blob
|
history
apps/autodist/tests/autodist2.test
patch
|
blob
|
history
diff --git
a/apps/autodist/CHANGES
b/apps/autodist/CHANGES
index f17113f25364d5be3ac7aa42927e767db6a9122f..b53b6d02166c9076e9acdd68852cb3e07d931d3b 100644
(file)
--- a/
apps/autodist/CHANGES
+++ b/
apps/autodist/CHANGES
@@
-1,3
+1,7
@@
+Tue Apr 19 17:12:09 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
+
+ * Remove extra ' ' and '\t' when joining backslashed lines.
+
Mon Apr 18 21:05:42 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
* Process '*.ad' files before calling autoconf and automake.
Mon Apr 18 21:05:42 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
* Process '*.ad' files before calling autoconf and automake.
diff --git
a/apps/autodist/autodist.in
b/apps/autodist/autodist.in
index 67a266314f42237d242ebe8e5282b42a64acdf09..ecb793cfefc2172702a3b9473f8ca5c0dd309de7 100755
(executable)
--- a/
apps/autodist/autodist.in
+++ b/
apps/autodist/autodist.in
@@
-376,7
+376,7
@@
ad_make_configure_ac()
# Remove any trailing backslashes
if test -f "$fname"; then
# Remove any trailing backslashes
if test -f "$fname"; then
- cat $fname | sed -e :a -e '/\\$/N; s/\\\n//; ta' > configure.ac
+ cat $fname | sed -e :a -e '/\\$/N; s/
[ ]*
\\\n//; ta' > configure.ac
else
cp -p $fname.tmp configure.ac
fi
else
cp -p $fname.tmp configure.ac
fi
@@
-437,7
+437,7
@@
ad_make_makefile_ams()
# Remove any trailing backslashes
if test -f "$fname.tmp"; then
# Remove any trailing backslashes
if test -f "$fname.tmp"; then
- cat $fname.tmp | sed -e :a -e '/\\$/N; s/\\\n//; ta' >> $fname.am
+ cat $fname.tmp | sed -e :a -e '/\\$/N; s/
[ ]*
\\\n//; ta' >> $fname.am
else
cat $ff >> $fname.am
fi
else
cat $ff >> $fname.am
fi
diff --git
a/apps/autodist/tests/autodist1.test
b/apps/autodist/tests/autodist1.test
index 2ea7cc433a29a62bd8e1e2df921ad14a20dab589..5175a28089171ac288ebeea53cf8c13d3114ad25 100755
(executable)
--- a/
apps/autodist/tests/autodist1.test
+++ b/
apps/autodist/tests/autodist1.test
@@
-26,11
+26,17
@@
echo configure.ad ok
EOF
cat << EOF > Makefile.ad
EOF
cat << EOF > Makefile.ad
-SUBDIRS= \
+SUBDIRS= \
\
#ifdef _DIST_NODEF
#ifdef _DIST_NODEF
- nodef \
+ nodef \\
+ poa \\
+ paa \\
#endif _DIST_NODEF
#endif _DIST_NODEF
-#endif
+ . \\
+ . \\
+ . \\
+ . \\
+
EOF
rm -rf distdir subdir
EOF
rm -rf distdir subdir
diff --git
a/apps/autodist/tests/autodist2.test
b/apps/autodist/tests/autodist2.test
index 3a01e4fa70184b45009fbde4823a663f14e1ebf5..780b16829f62330989b3e142a0a52712b1c4547e 100755
(executable)
--- a/
apps/autodist/tests/autodist2.test
+++ b/
apps/autodist/tests/autodist2.test
@@
-26,11
+26,12
@@
echo configure.ad ok
EOF
cat << EOF > Makefile.ad
EOF
cat << EOF > Makefile.ad
-SUBDIRS= \
+SUBDIRS= \
\
#ifndef _DIST_TEST
#ifndef _DIST_TEST
- nodef \
+ nodef \
\
#endif _DIST_TEST
#endif _DIST_TEST
-#endif
+ . \\
+
EOF
rm -rf distdir subdir
EOF
rm -rf distdir subdir