Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 43d9797e 43d9797eef76ba39c987f227d8ac44983ce201e4 by Sergey Poznyakoff
Options

Minor fixes 

* mu/Makefile.am (mailutils-config): Fix sed expression
* mu/mailutils-config.in: Replace MUNAME once and assign
it to the variable.
1 parent ec100ee6
Inline Side-by-side
Showing 2 changed files with 13 additions and 11 deletions
...@@ -20,9 +20,10 @@ bin_SCRIPTS = mailutils-config ...@@ -20,9 +20,10 @@ bin_SCRIPTS = mailutils-config
20 20
21 CLEANFILES=mailutils-config 21 CLEANFILES=mailutils-config
22 mailutils-config: $(top_srcdir)/mu/mailutils-config.in 22 mailutils-config: $(top_srcdir)/mu/mailutils-config.in
23 $(AM_V_GEN)muname=`echo mu | \ 23 $(AM_V_GEN)muname=mu; \
24 sed -e 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ 24 test -n "$(transform)" && \
25 sed 'N;N;N;s,\n, ,g'`; \ 25 muname=`echo $$muname | \
26 sed -e 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
26 sed 's/MUNAME/'$$muname'/g' $(top_srcdir)/mu/mailutils-config.in > mailutils-config 27 sed 's/MUNAME/'$$muname'/g' $(top_srcdir)/mu/mailutils-config.in > mailutils-config
27 28
28 29
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
23 mode= 23 mode=
24 file= 24 file=
25 dir=`expr "$0" : '\(.*\)/.*'` 25 dir=`expr "$0" : '\(.*\)/.*'`
26 muname=MUNAME
26 27
27 test -n "$dir" && PATH=$PATH:$dir 28 test -n "$dir" && PATH=$PATH:$dir
28 29
...@@ -34,13 +35,13 @@ alternatives instead: ...@@ -34,13 +35,13 @@ alternatives instead:
34 35
35 Traditional usage | Use instead 36 Traditional usage | Use instead
36 ------------------------------+------------------- 37 ------------------------------+-------------------
37 mailutils-config --compile | MUNAME cflags 38 mailutils-config --compile | $muname cflags
38 mailutils-config --link | MUNAME ldflags 39 mailutils-config --link | $muname ldflags
39 mailutils-config --info | MUNAME info 40 mailutils-config --info | $muname info
40 mailutils-config --query | MUNAME query 41 mailutils-config --query | $muname query
41 mailutils-config --query=FILE | MUNAME query -f FILE 42 mailutils-config --query=FILE | $muname query -f FILE
42 43
43 For more information, try \`MUNAME --help'. 44 For more information, try \`$muname --help'.
44 45
45 EOT 46 EOT
46 exit 0 47 exit 0
...@@ -93,7 +94,7 @@ do ...@@ -93,7 +94,7 @@ do
93 usage 94 usage
94 ;; 95 ;;
95 -V|--version|--versio|--versi|--vers|--ver|--ve|--v) 96 -V|--version|--versio|--versi|--vers|--ver|--ve|--v)
96 MUNAME --version | sed -n '1{s/^MUNAME/mailutils-config/;s/(\(GNU Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}' 97 $muname --version | sed -n '1{s/^MUNAME/mailutils-config/;s/(\(GNU Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}'
97 exit 0 98 exit 0
98 ;; 99 ;;
99 *) 100 *)
...@@ -111,4 +112,4 @@ if test -n "$file"; then ...@@ -111,4 +112,4 @@ if test -n "$file"; then
111 set -- -f"$file" $* 112 set -- -f"$file" $*
112 fi 113 fi
113 114
114 MUNAME $mode $* 115 $muname $mode $*
......