Module: sip-router Branch: master Commit: bf9d269f1a903288b0361a538070191b52535f10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf9d269… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 1 13:01:34 2010 +0200 doc: *_list: minor sed script fix Fix empty output for the sed script for parsing/filtering makefiles (in some cases the commands for the last line were not executed). --- doc/cfg_list/Makefile | 8 ++++---- doc/rpc_list/Makefile | 8 ++++---- doc/select_list/Makefile | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index a10aaef..2aa9756 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -127,11 +127,11 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ -e ': start' \ - -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]*\($$\|.*[^\]$$\)/{H;d}' \ - -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]*\($$\|.*[^\]$$\)/{H;b end}' \ + -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]\+.*[\]$$/,/[^\]$$/{H;b end}' \ -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:\([^=]\|$$\)/b eat_rule' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/\(^$$\)\|\([^\]$$\)/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;b end}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/\(^$$\)\|\([^\]$$\)/{H;b end}' \ -e ': end' \ -e '$${g;s/\n/^LF^/g;p}'\ -e 'b' \ diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index bf9f5bf..06b4a32 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -143,11 +143,11 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ -e ': start' \ - -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]*\($$\|.*[^\]$$\)/{H;d}' \ - -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]*\($$\|.*[^\]$$\)/{H;b end}' \ + -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]\+.*[\]$$/,/[^\]$$/{H;b end}' \ -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:\([^=]\|$$\)/b eat_rule' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/\(^$$\)\|\([^\]$$\)/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;b end}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/\(^$$\)\|\([^\]$$\)/{H;b end}' \ -e ': end' \ -e '$${g;s/\n/^LF^/g;p}'\ -e 'b' \ diff --git a/doc/select_list/Makefile b/doc/select_list/Makefile index 7d43356..ae84037 100644 --- a/doc/select_list/Makefile +++ b/doc/select_list/Makefile @@ -136,11 +136,11 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ -e ': start' \ - -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]*\($$\|.*[^\]$$\)/{H;d}' \ - -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]*\($$\|.*[^\]$$\)/{H;b end}' \ + -e '/^\(ifeq\|ifneq\|else\|endif\)[\t ]\+.*[\]$$/,/[^\]$$/{H;b end}' \ -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:\([^=]\|$$\)/b eat_rule' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ - -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/\(^$$\)\|\([^\]$$\)/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;b end}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/\(^$$\)\|\([^\]$$\)/{H;b end}' \ -e ': end' \ -e '$${g;s/\n/^LF^/g;p}'\ -e 'b' \