diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-08-12 19:32:17 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-08-12 19:32:17 +0300 |
| commit | 3b80e5be5d9efcec1f73deda7fd4910f48834a83 (patch) | |
| tree | 23d127a26f868e3066546aefcf37601394c20189 | |
| parent | 70bc75567b2ea3e0309b9171168bc1d2c1cadf43 (diff) | |
| parent | 46810569c80b88bb468600eefe2eb460487ee0a1 (diff) | |
| download | egawk-3b80e5be5d9efcec1f73deda7fd4910f48834a83.tar.gz egawk-3b80e5be5d9efcec1f73deda7fd4910f48834a83.tar.bz2 egawk-3b80e5be5d9efcec1f73deda7fd4910f48834a83.zip | |
Merge branch 'gawk-4.1-stable'
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/Makefile.am | 7 | ||||
| -rw-r--r-- | extension/Makefile.in | 7 |
6 files changed, 24 insertions, 13 deletions
@@ -13,9 +13,9 @@ Unrelated: - * Makefile.am (dist-hook): Replace use of $(RM) by rm -f; not all - versions of make set that variable. Thanks to Jeremie - Courreges-Anglas <jca@wxcvbn.org> for the report. + * Makefile.am (RM): Define for makes that don't have it, + such as on OpenBSD. Thanks to Jeremie Courreges-Anglas + <jca@wxcvbn.org> for the report. 2014-08-05 Arnold D. Robbins <arnold@skeeve.com> diff --git a/Makefile.am b/Makefile.am index c14a39b3..9a5e1618 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,6 +144,9 @@ CLEANFILES = core core.* # We want hard links for install-exec-hook, below LN= ln +# For some make's, e.g. OpenBSD, that don't define this +RM = rm -f + # First, add a link from gawk to gawk-X.Y.Z. # # For GNU systems where gawk is awk, add a link to awk. @@ -176,7 +179,7 @@ dist-hook: sed -n -f configpk.sed < ../configure.ac > /tmp/tmp.sed ; \ sed -f config.sed < ../configh.in > /tmp/config.tmp ; \ sed -f /tmp/tmp.sed < /tmp/config.tmp > config.h ; \ - rm -f /tmp/tmp.sed /tmp/config.tmp + $(RM) /tmp/tmp.sed /tmp/config.tmp pwd chmod u+w $(distdir)/pc/config.h cp $(srcdir)/pc/config.h $(distdir)/pc/config.h diff --git a/Makefile.in b/Makefile.in index ae307ff4..c44d10b5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -542,6 +542,9 @@ CLEANFILES = core core.* # We want hard links for install-exec-hook, below LN = ln + +# For some make's, e.g. OpenBSD, that don't define this +RM = rm -f all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1175,7 +1178,7 @@ dist-hook: sed -n -f configpk.sed < ../configure.ac > /tmp/tmp.sed ; \ sed -f config.sed < ../configh.in > /tmp/config.tmp ; \ sed -f /tmp/tmp.sed < /tmp/config.tmp > config.h ; \ - rm -f /tmp/tmp.sed /tmp/config.tmp + $(RM) /tmp/tmp.sed /tmp/config.tmp pwd chmod u+w $(distdir)/pc/config.h cp $(srcdir)/pc/config.h $(distdir)/pc/config.h diff --git a/extension/ChangeLog b/extension/ChangeLog index 295e72cc..f324bdeb 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,9 +1,8 @@ 2014-08-12 Arnold D. Robbins <arnold@skeeve.com> - * Makefile.am (install-data-hook): Replace use of $(RM) by rm -f; - not all versions of make set that variable. Thanks to Jeremie - Courreges-Anglas <jca@wxcvbn.org> for the report. - (uninstall-so): Ditto. + * Makefile.am (RM): Define for makes that don't have it, + such as on OpenBSD. Thanks to Jeremie Courreges-Anglas + <jca@wxcvbn.org> for the report. 2014-06-13 Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/extension/Makefile.am b/extension/Makefile.am index b6c969ba..e6678c54 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -29,6 +29,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. # correctly after changing configure.ac ACLOCAL_AMFLAGS = -I m4 +# For some make's, e.g. OpenBSD, that don't define this +RM = rm -f + # Note: rwarray does not currently compile. pkgextension_LTLIBRARIES = \ @@ -100,12 +103,12 @@ testext_la_LIBADD = $(MY_LIBS) install-data-hook: for i in $(pkgextension_LTLIBRARIES) ; do \ - rm -f $(DESTDIR)$(pkgextensiondir)/$$i ; \ + $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ done # Keep the uninstall check working: uninstall-so: - rm -f $(DESTDIR)$(pkgextensiondir)/*.so + $(RM) $(DESTDIR)$(pkgextensiondir)/*.so uninstall-recursive: uninstall-so diff --git a/extension/Makefile.in b/extension/Makefile.in index 692998bf..46168e4e 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -513,6 +513,9 @@ AM_CPPFLAGS = -I$(srcdir)/.. # correctly after changing configure.ac ACLOCAL_AMFLAGS = -I m4 +# For some make's, e.g. OpenBSD, that don't define this +RM = rm -f + # Note: rwarray does not currently compile. pkgextension_LTLIBRARIES = \ filefuncs.la \ @@ -1231,12 +1234,12 @@ uninstall-man: uninstall-man3 install-data-hook: for i in $(pkgextension_LTLIBRARIES) ; do \ - rm -f $(DESTDIR)$(pkgextensiondir)/$$i ; \ + $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ done # Keep the uninstall check working: uninstall-so: - rm -f $(DESTDIR)$(pkgextensiondir)/*.so + $(RM) $(DESTDIR)$(pkgextensiondir)/*.so uninstall-recursive: uninstall-so |