diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-05-25 07:20:09 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-05-25 07:20:09 +0300 |
| commit | 43d9797eef76ba39c987f227d8ac44983ce201e4 (patch) | |
| tree | 986d89113c2d87c7f45fae85cda9915e49e2649d /mu | |
| parent | ec100ee63e55ba60369363c72d6d2e1fbc3663a2 (diff) | |
| download | mailutils-43d9797eef76ba39c987f227d8ac44983ce201e4.tar.gz mailutils-43d9797eef76ba39c987f227d8ac44983ce201e4.tar.bz2 | |
Minor fixes
* mu/Makefile.am (mailutils-config): Fix sed expression
* mu/mailutils-config.in: Replace MUNAME once and assign
it to the variable.
Diffstat (limited to 'mu')
| -rw-r--r-- | mu/Makefile.am | 7 | ||||
| -rw-r--r-- | mu/mailutils-config.in | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/mu/Makefile.am b/mu/Makefile.am index ae307ea35..cb6de0b6f 100644 --- a/mu/Makefile.am +++ b/mu/Makefile.am @@ -20,9 +20,10 @@ bin_SCRIPTS = mailutils-config CLEANFILES=mailutils-config mailutils-config: $(top_srcdir)/mu/mailutils-config.in - $(AM_V_GEN)muname=`echo mu | \ - sed -e 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g'`; \ + $(AM_V_GEN)muname=mu; \ + test -n "$(transform)" && \ + muname=`echo $$muname | \ + sed -e 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ sed 's/MUNAME/'$$muname'/g' $(top_srcdir)/mu/mailutils-config.in > mailutils-config diff --git a/mu/mailutils-config.in b/mu/mailutils-config.in index b7e3661dd..050d2d689 100644 --- a/mu/mailutils-config.in +++ b/mu/mailutils-config.in @@ -23,6 +23,7 @@ mode= file= dir=`expr "$0" : '\(.*\)/.*'` +muname=MUNAME test -n "$dir" && PATH=$PATH:$dir @@ -34,13 +35,13 @@ alternatives instead: Traditional usage | Use instead ------------------------------+------------------- - mailutils-config --compile | MUNAME cflags - mailutils-config --link | MUNAME ldflags - mailutils-config --info | MUNAME info - mailutils-config --query | MUNAME query - mailutils-config --query=FILE | MUNAME query -f FILE + mailutils-config --compile | $muname cflags + mailutils-config --link | $muname ldflags + mailutils-config --info | $muname info + mailutils-config --query | $muname query + mailutils-config --query=FILE | $muname query -f FILE -For more information, try \`MUNAME --help'. +For more information, try \`$muname --help'. EOT exit 0 @@ -93,7 +94,7 @@ do usage ;; -V|--version|--versio|--versi|--vers|--ver|--ve|--v) - MUNAME --version | sed -n '1{s/^MUNAME/mailutils-config/;s/(\(GNU Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}' + $muname --version | sed -n '1{s/^MUNAME/mailutils-config/;s/(\(GNU Mailutils\)) \([0-9][0-9.]*\).*/(\1 \2)/;p}' exit 0 ;; *) @@ -111,4 +112,4 @@ if test -n "$file"; then set -- -f"$file" $* fi -MUNAME $mode $* +$muname $mode $* |