fix awk re

[m6w6/ext-psi] / m4 / psi / psi_macro.m4

diff --git a/m4/psi/psi_macro.m4 b/m4/psi/psi_macro.m4
index 35af8a4251e2f19d4a1e464c6264d9dd906cbc3e..9ff8fd9e1a399e42d1b3254686c93cb7004bfae1 100644 (file)
--- a/m4/psi/psi_macro.m4
+++ b/m4/psi/psi_macro.m4
@@ -1,9 +1,8 @@
 # psi_add_macro(macro)
-# Add a pre-defined macro function to $PSI_MACROS.
+# Add a pre-defined macro function to $PSI_MACROS_H.
 psi_add_macro() {
-       cat >>$PSI_MACROS <<EOF
-$1
-EOF
+       PSI_MACROS="$PSI_MACROS
+$1"
 }
 
 dnl PSI_MACRO(macro, decl args, action-if-true)
@@ -49,7 +48,7 @@ AC_DEFUN(PSI_MACRO, [
                $3
                psi_add_macro "$macro_return _psi_${macro_action}_$macro_name$macro_decl { $macro_body }"
                PSI_REDIR($macro_name, _psi_${macro_action}_$macro_name)
-       ], [], [PSI_INCLUDES])
+       ], [], PSI_INCLUDES)
 ])
 
 dnl PSI_EXTVAR(type var)
@@ -60,12 +59,12 @@ AC_DEFUN(PSI_EXTVAR, [
                psi_add_decl "$psi_decl_args"
                dnl explicit getter
                PSI_REDIR([${macro_name}_get], [_psi_get_$macro_name])
-               PSI_DECL_ARGS([PSI_VAR_TYPE_RETURN($1) PSI_VAR_NAME($1)_get])
+               PSI_DECL_ARGS(PSI_VAR_TYPE_RETURN([$1]) PSI_VAR_NAME([$1])_get)
                psi_add_decl "$psi_decl_args"
                dnl setter
                psi_add_macro "void _psi_set_${macro_name}($macro_type value$macro_array) { memcpy(&$macro_name, &value, sizeof($macro_type$macro_array)); }"
                PSI_REDIR([${macro_name}_set], [_psi_set_${macro_name}])
-               PSI_DECL_ARGS([void PSI_VAR_NAME($1)_set], [($1)])
+               PSI_DECL_ARGS([void ]PSI_VAR_NAME([$1])[_set], [($1)])
                psi_add_decl "$psi_decl_args"
        ])
 ])