[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: Fix build on MacOS X
From: |
Bertrand Garrigues |
Subject: |
[groff] 01/01: Fix build on MacOS X |
Date: |
Fri, 1 Sep 2017 18:04:50 -0400 (EDT) |
bgarrigues pushed a commit to branch master
in repository groff.
commit 07b73a459eb715383e0f995bedd06ffb78a6d8b7
Author: Bertrand Garrigues <address@hidden>
Date: Sat Sep 2 00:03:57 2017 +0200
Fix build on MacOS X
* Makefile.am: define `SED' command with LANG and LC_ALL set to C.
* contrib/mm/mm.am: use it.
* doc/doc.am: Ditto.
Fix bug https://savannah.gnu.org/bugs/?49649
---
ChangeLog | 10 ++++++++++
Makefile.am | 6 ++++++
contrib/mm/mm.am | 8 ++++----
doc/doc.am | 2 +-
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0d13b72..4602921 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-09-01 Bertrand Garrigues <address@hidden>
+
+ Fix build on MacOS X
+
+ * Makefile.am: define `SED' command with LANG and LC_ALL set to C.
+ * contrib/mm/mm.am: use it.
+ * doc/doc.am: Ditto.
+
+ Fix bug https://savannah.gnu.org/bugs/?49649
+
2017-08-30 Colin Watson <address@hidden>
`BuildFoundries' should not be installed.
diff --git a/Makefile.am b/Makefile.am
index 2697115..9055036 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -516,6 +516,12 @@ ETAGSCCFLAG=-C
# Sed script to deal with OS dependencies in sh scripts.
SH_DEPS_SED_SCRIPT=$(top_builddir)/shdeps.sed
+# On some platforms we need to set LANG and LC_ALL to C for sed
+SED=\
+ LANG=C \
+ LC_ALL=C \
+ sed
+
# The program to create directory hierarchies.
# mkinstalldirs is now in gnulib/build-aux
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index abdc071..d591e21 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -63,7 +63,7 @@ EXTRA_DIST += \
contrib/mm/mmroff.pl
mmroff: $(mm_srcdir)/mmroff.pl
- sed -e 's;/usr/bin/perl;$(PERL);' $(mm_srcdir)/mmroff.pl >$@
+ $(SED) -e 's;/usr/bin/perl;$(PERL);' $(mm_srcdir)/mmroff.pl >$@
chmod +x $@
# Special installation rules for m.tmac, mse.tmac, mmse.tmac, mm.tmac
@@ -76,11 +76,11 @@ install_mm:
$(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
$(INSTALL_DATA) $(mm_srcdir)/m.tmac \
$(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
- sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
+ $(SED) -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
$(mm_srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
- @sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \
+ @$(SED) -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \
$(mm_srcdir)/mmse.tmac >
$(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
- @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
+ @$(SED) -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
$(mm_srcdir)/mm.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
@for f in $(MMLOCALE); do \
test -f $(DESTDIR)$(tmacdir)/mm/$$f \
diff --git a/doc/doc.am b/doc/doc.am
index 27f47d6..5d9c7ea 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -23,7 +23,7 @@
doc_srcdir = $(abs_top_srcdir)/doc
doc_builddir = $(abs_top_builddir)/doc
-DOC_SED = sed -e "s;address@hidden@];$(VERSION);"
+DOC_SED = $(SED) -e "s;address@hidden@];$(VERSION);"
DOC_GROFF_ONLY=\
GROFF_COMMAND_PREFIX= \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: Fix build on MacOS X,
Bertrand Garrigues <=