maint: don't assume GNU make \# syntax (fix previous)
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 22:03:57 +0000 (14:03 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Dec 2011 22:04:37 +0000 (14:04 -0800)
* src/Makefile.am (fs_normalize_perl_subst, fs-magic, fs-kernel-magic):
Undo previous patch; it missed a \#.
(fs_normalize_perl_subst): Use \043 rather than \#.
\043 is portable to all ASCIIish platforms, whereas \# is portable
only to platforms that are compatible with GNU make (and are
incompatible with POSIX make).  Porting this to EBCDIC is left as
an exercise for the reader....

src/Makefile.am

index e25fed4..f36e138 100644 (file)
@@ -571,10 +571,11 @@ fs_normalize_perl_subst =                 \
   -e 's/(\s+0x)(\X{6})\b/$${1}00$$2/;'         \
   -e 's/(\s+0x)(\X{7})\b/$${1}0$$2/;'          \
   -e 's/^\s+//;'                               \
-  -e 's/^\#define\s+//;'                       \
+  -e 's/^\043define\s+//;'                     \
   -e 's/^_(XIAFS)/$$1/;'                       \
   -e 's/^USBDEVICE/USBDEVFS/;'                 \
   -e 's/NTFS_SB/NTFS/;'                                \
+  -e 's/^/\043 define S_MAGIC_/;'              \
   -e 's,\s*/\* .*? \*/,,;'
 
 CLEANFILES += fs-magic
@@ -582,7 +583,7 @@ fs-magic: Makefile
        man statfs \
          |perl -ne '/File system types:/.../Nobody kno/ and print'     \
          |grep 0x | perl -p                                            \
-           $(fs_normalize_perl_subst) -e 's/^/# define S_MAGIC_/;'     \
+           $(fs_normalize_perl_subst)                                  \
          | grep -Ev 'S_MAGIC_EXT[34]|STACK_END'                        \
          | LC_ALL=C sort                                               \
          > $@-t && mv $@-t $@
@@ -591,7 +592,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) -e 's/^/# define S_MAGIC_/;'     \
+           $(fs_normalize_perl_subst)                                  \
          | grep -Ev 'S_MAGIC_EXT[34]|STACK_END'                        \
          | LC_ALL=C sort                                               \
          > $@-t && mv $@-t $@