maint: don't assume GNU make \# syntax
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 21:29:28 +0000 (13:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 21:30:15 +0000 (13:30 -0800)
* 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.

src/Makefile.am

index b0b7eb5..e25fed4 100644 (file)
@@ -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 $@