diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-06-13 10:31:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-06-13 10:38:21 -0700 |
| commit | 29441fd7bc60ec6010e64f5e8b702c4b6290cec4 (patch) | |
| tree | f0bbfb8d47c0b440aa1287a3e7423edebcda094e /gnulib-tool | |
| parent | 9ad0d4f1c595e5d430a3ffcf332e280b3f4cf965 (diff) | |
| download | gnulib-29441fd7bc60ec6010e64f5e8b702c4b6290cec4.tar.gz | |
getopt-gnu: port back to Solaris 10
* gnulib-tool (func_emit_lib_Makefile_am)
(func_emit_tests_Makefile_am): Don’t substitute things like
$(GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT),
as this mishandles unistd and getopt-gnu, which breaks
‘make check’ on Solaris 10 with getopt-gnu.
* pygnulib/GLEmiter.py (lib_Makefile_am, tests_Makefile_am):
Likewise, albeit hackier since I did not test this and
so went with a trivial hack instead.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnulib-tool b/gnulib-tool index 63a875d4a2..1ea6580b37 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3700,7 +3700,7 @@ func_emit_lib_Makefile_am () -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ - -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \ + -e 's,\$(\(GNULIB_[A-Z]\),$('"${module_indicator_prefix}"'_\1,' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ -e "$sed_transform_check_PROGRAMS" \ @@ -3714,7 +3714,7 @@ func_emit_lib_Makefile_am () func_get_automake_snippet_unconditional "$module" | LC_ALL=C \ sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ - -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' + -e 's,\$(\(GNULIB_[A-Z]\),$('"${module_indicator_prefix}"'_\1,' } > "$tmp"/amsnippet2 # Skip the contents if it's entirely empty. if grep '[^ ]' "$tmp"/amsnippet1 "$tmp"/amsnippet2 > /dev/null ; then @@ -4058,7 +4058,7 @@ func_emit_tests_Makefile_am () -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ - -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \ + -e 's,\$(\(GNULIB_[A-Z]\),$('"${module_indicator_prefix}"'_\1,' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ -e "$sed_transform_check_PROGRAMS" \ @@ -4072,7 +4072,7 @@ func_emit_tests_Makefile_am () func_get_automake_snippet_unconditional "$module" | LC_ALL=C \ sed -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ - -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' + -e 's,\$(\(GNULIB_[A-Z]\),$('"${module_indicator_prefix}"'_\1,' } > "$tmp"/amsnippet2 # Skip the contents if it's entirely empty. if grep '[^ ]' "$tmp"/amsnippet1 "$tmp"/amsnippet2 > /dev/null ; then |