diff options
| author | Malcolm Tredinnick <malcolm@src.gnome.org> | 2003-03-07 02:15:26 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm@src.gnome.org> | 2003-03-07 02:15:26 +0000 |
| commit | a2dbeb08cc140524c6ddc94e215d183a0e08b12a (patch) | |
| tree | 2b891eb4c2bc7aca9eb03413b464452ea6605ad4 | |
| parent | abc677038b7d7f1ec005e4cec344049130c800c8 (diff) | |
| download | shared-mime-info-a2dbeb08cc140524c6ddc94e215d183a0e08b12a.tar.gz | |
Replace PACKAGE with PKG_NAME, since PKG_NAME is what is defined by the
* autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME is
what is defined by the various applications' autogen.sh. Also,
call autopoint rather than gettextize when appropriate (when
AM_GNU_GETTEXT_VERSION is present).
svn path=/trunk/; revision=2781
| -rw-r--r-- | macros2/ChangeLog | 7 | ||||
| -rw-r--r-- | macros2/autogen.sh | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index de85225a..f47c46c4 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,10 @@ +2003-03-07 Malcolm Tredinnick <malcolm@commsecure.com.au> + + * autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME is + what is defined by the various applications' autogen.sh. Also, + call autopoint rather than gettextize when appropriate (when + AM_GNU_GETTEXT_VERSION is present). + 2003-02-27 Mark McLoughlin <mark@skynet.ie> * compiler-flags.m4: fix mixed up order of arguments to diff --git a/macros2/autogen.sh b/macros2/autogen.sh index f1a0437d..b19d539a 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -2,7 +2,7 @@ # Run this to generate all the initial makefiles, etc. #name of package -PACKAGE=${PACKAGE:-Package} +PKG_NAME=${PKG_NAME:-Package} srcdir=${srcdir:-.} # default version requirements ... @@ -316,8 +316,13 @@ for configure_ac in $configure_files; do printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 + if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then + printbold "Running autopoint..." + autopoint --force || exit 1 + else + printbold "Running $GETTEXTIZE... Ignore non-fatal messages." + echo "no" | $GETTEXTIZE --force --copy || exit 1 + fi fi if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then printbold "Running $INTLTOOLIZE..." |