diff options
| author | ivan <ivan> | 2005-10-15 09:11:20 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2005-10-15 09:11:20 +0000 |
| commit | 673b9a458d9138523026963df6fa3b4683e09bae (patch) | |
| tree | 42acc524ff5fd53e4fdb2f5b6dac4a42ce8057f6 /rt/m4 | |
| parent | 591613cf1c861505335646fff3ffb4a705e011bf (diff) | |
| parent | d4d0590bef31071e8809ec046717444b95b3f30a (diff) | |
This commit was generated by cvs2svn to compensate for changes in r4407,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/m4')
| -rw-r--r-- | rt/m4/rt_layout.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rt/m4/rt_layout.m4 b/rt/m4/rt_layout.m4 index 393b32175..c92a108ca 100644 --- a/rt/m4/rt_layout.m4 +++ b/rt/m4/rt_layout.m4 @@ -21,14 +21,15 @@ AC_DEFUN([RT_LAYOUT],[ pldconf=./config.pld $PERL -0777 -p -e "\$layout = '$2';" -e ' s/.*<Layout\s+$layout>//gims; - s/\<\/Layout\>.*//s; - s/^#.*$//m; + s/<\/Layout>.*//s; + s/^#.*$//gm; s/^\s+//gim; s/\s+$/\n/gim; s/\+$/\/rt3/gim; # m4 will not let us just use $1, we need @S|@1 - s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim; - s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim; +# s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim; + # uh, should be [:=], but m4 apparently substitutes something... + s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim; ' < $1 > $pldconf if test -s $pldconf; then |