summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-05 13:29:28 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-05 13:30:15 -0800
commit787592587d0a1cfac77d31c7808fc0b0a04a0334 (patch)
treeae8b483f2c6ad4d55f5d7b34db478969be66fa9b /src
parent63098ee58235f5a1877220e8c073f6f23b09264f (diff)
downloadcoreutils-787592587d0a1cfac77d31c7808fc0b0a04a0334.tar.xz
maint: don't assume GNU make \# syntax
* src/Makefile.am (fs_normalize_perl_subst): Don't make unportable assumption about \# in the right hand side of a macro definition. This works with GNU make, but not with POSIX make. Problem reported by Basavaraj B (Bug#10220). (fs-magic, fs-kernel-magic): Do the #-substitution here instead.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b0b7eb527..e25fed407 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -575,7 +575,6 @@ fs_normalize_perl_subst = \
-e 's/^_(XIAFS)/$$1/;' \
-e 's/^USBDEVICE/USBDEVFS/;' \
-e 's/NTFS_SB/NTFS/;' \
- -e 's/^/\# define S_MAGIC_/;' \
-e 's,\s*/\* .*? \*/,,;'
CLEANFILES += fs-magic
@@ -583,7 +582,7 @@ fs-magic: Makefile
man statfs \
|perl -ne '/File system types:/.../Nobody kno/ and print' \
|grep 0x | perl -p \
- $(fs_normalize_perl_subst) \
+ $(fs_normalize_perl_subst) -e 's/^/# define S_MAGIC_/;' \
| grep -Ev 'S_MAGIC_EXT[34]|STACK_END' \
| LC_ALL=C sort \
> $@-t && mv $@-t $@
@@ -592,7 +591,7 @@ CLEANFILES += fs-kernel-magic
fs-kernel-magic: Makefile
perl -ne '/^#define.*0x/ and print' /usr/include/linux/magic.h \
| perl -p \
- $(fs_normalize_perl_subst) \
+ $(fs_normalize_perl_subst) -e 's/^/# define S_MAGIC_/;' \
| grep -Ev 'S_MAGIC_EXT[34]|STACK_END' \
| LC_ALL=C sort \
> $@-t && mv $@-t $@