From: Bruno Haible Date: Tue, 16 Jul 2002 19:06:22 +0000 (+0000) Subject: Small improvement. X-Git-Tag: v0.11.3~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=751343590c94fe7fe46a6184fa6bb4a7b96c3538;p=thirdparty%2Fgettext.git Small improvement. --- diff --git a/src/ChangeLog b/src/ChangeLog index 64a856088..9653d8cef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-07-16 Bruno Haible + + * project-id: Make it work when the configure file was generated by + autoconf-2.52 with AC_INIT and AM_INIT_AUTOMAKE(...). + 2002-06-14 Bruno Haible * po-lex.c (mbfile_getc): Handle the case where iconv converts diff --git a/src/project-id b/src/project-id index 099edf436..fc746c605 100755 --- a/src/project-id +++ b/src/project-id @@ -20,7 +20,7 @@ want_version="$1" while true; do if test -f configure; then - package=`(grep '^PACKAGE_NAME=' configure; grep '^PACKAGE=' configure) | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"` + package=`(grep '^PACKAGE_NAME=' configure; grep '^PACKAGE=' configure) | grep -v '=[ ]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"` case "$package" in *[\"\$\`\{\}]*) # Some packages (gcal) retrieve the package name dynamically. @@ -33,7 +33,7 @@ while true; do package="GNU $package" fi if test -n "$want_version"; then - version=`(grep '^PACKAGE_VERSION=' configure; grep '^VERSION=' configure) | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"` + version=`(grep '^PACKAGE_VERSION=' configure; grep '^VERSION=' configure) | grep -v '=[ ]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"` case "$version" in *[\"\$\`\{\}]*) # Some packages (gcal, gcc, clisp) retrieve the version dynamically.