diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2013-02-03 20:12:12 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2013-02-03 20:12:12 +0200 |
| commit | ae0d3255ddd792402650ad0caaf611dcc3ada091 (patch) | |
| tree | 29e84a70d30630de638752bdf64be6ca1a1656fc /awklib | |
| parent | e893d68460908a358a3a0cfbb08c177610955eaf (diff) | |
| download | egawk-ae0d3255ddd792402650ad0caaf611dcc3ada091.tar.gz egawk-ae0d3255ddd792402650ad0caaf611dcc3ada091.tar.bz2 egawk-ae0d3255ddd792402650ad0caaf611dcc3ada091.zip | |
Additional changes for cross-compiling.
Diffstat (limited to 'awklib')
| -rw-r--r-- | awklib/ChangeLog | 5 | ||||
| -rw-r--r-- | awklib/Makefile.am | 5 | ||||
| -rw-r--r-- | awklib/Makefile.in | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/awklib/ChangeLog b/awklib/ChangeLog index 1b6a31e6..e286a469 100644 --- a/awklib/ChangeLog +++ b/awklib/ChangeLog @@ -1,3 +1,8 @@ +2013-02-03 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am (AWKPROG): Add definition and conditional for + cross compiling. Thanks to Juergen Kahrs. + 2013-01-08 Andrew J. Schorr <aschorr@telemetry-investments.com> * eg/lib/inplace.awk: Add new file generated from doc/gawk.texi. diff --git a/awklib/Makefile.am b/awklib/Makefile.am index 4ff14036..b10fa644 100644 --- a/awklib/Makefile.am +++ b/awklib/Makefile.am @@ -26,7 +26,12 @@ EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg # With some locales, the script extract.awk fails. # So we fix the locale to some sensible value. + +if TEST_CROSS_COMPILE +AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT) +else AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT) +endif # Get config.h from the build directory and custom.h from the source directory. AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) diff --git a/awklib/Makefile.in b/awklib/Makefile.in index d4a7788c..f392eeb7 100644 --- a/awklib/Makefile.in +++ b/awklib/Makefile.in @@ -276,9 +276,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ EXTRA_DIST = ChangeLog ChangeLog.0 extract.awk eg $(srcdir)/stamp-eg +@TEST_CROSS_COMPILE_FALSE@AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT) # With some locales, the script extract.awk fails. # So we fix the locale to some sensible value. -AWKPROG = LC_ALL=C LANG=C $(abs_top_builddir)/gawk$(EXEEXT) +@TEST_CROSS_COMPILE_TRUE@AWKPROG = LC_ALL=C LANG=C awk$(EXEEXT) # Get config.h from the build directory and custom.h from the source directory. AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) |