diff options
| author | dobey <> | 2007-08-02 23:49:23 +0000 |
|---|---|---|
| committer | dobey <> | 2007-08-02 23:49:23 +0000 |
| commit | f126f7007fec48cf43519a69ccd2ed73bc26929f (patch) | |
| tree | 3edc66a118e42c0cb1ebd026240ff10412bd6508 /Makefile.am | |
| parent | 8967062eb52c62e58461a269403a68d2700f233f (diff) | |
| download | intltool-f126f7007fec48cf43519a69ccd2ed73bc26929f.tar.gz | |
2007-08-02 Rodney Dawes <dobey.pwns@gmail.com>
* configure.in:
* Makefile.am:
* intltool.m4:
Don't need the xgettext/msgfmt/msgmerge/iconv checks any more
Don't need to substitute xgettext/msgfmt/msgmerge/iconv variables
* intltool-merge.in.in: Add isProgramInPath and isGNUGettextTool
methods and check for GNU iconv here
* intltool-update.in.in (Get_Program_Path):
Rename to isProgramInPath
Use $devnull to redirect
Pass --version to $file to avoid "no input file" errors
(isGNUGettextTool): New method to check for GNU gettext tools
(GenerateHeaders, GeneratePOTemplate, POFile_Update):
(Console_Write_TranslationStatus, Console_Write_CoverateReport):
Update to use isGNUGettextTool to ensure we use GNU gettext tools
Fixes #301364 and #311936
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index a16e855..17e2a07 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,10 +39,6 @@ edit_in_in = sed -e 's|[@]PACKAGE@|$(PACKAGE)|g' \ -e 's|[@]VERSION@|$(VERSION)|g' edit = $(edit_in_in) -e "s|[@]INTLTOOL_PERL@|$(PERL)|g" \ - -e "s|[@]INTLTOOL_ICONV@|$(INTLTOOL_ICONV)|g" \ - -e "s|[@]INTLTOOL_MSGFMT@|$(INTLTOOL_MSGFMT)|g" \ - -e "s|[@]INTLTOOL_MSGMERGE@|$(INTLTOOL_MSGMERGE)|g" \ - -e "s|[@]INTLTOOL_XGETTEXT@|$(INTLTOOL_XGETTEXT)|g" \ -e "s|[@]INTLTOOL_LIBDIR@|$(libdir)|g" intltool-extract.in: intltool-extract.in.in Makefile |