diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-08-12 06:32:46 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-08-12 06:32:46 +0300 |
| commit | 70bc75567b2ea3e0309b9171168bc1d2c1cadf43 (patch) | |
| tree | 8b83a3e9a70d89e0fe24e6a80598fb996d6b291d /extension | |
| parent | 52c0756d5d49d1077035167f50a15c8b952d0f69 (diff) | |
| parent | 1be1a93e63a7ff6b45c7c20908df8bfd2a86c1be (diff) | |
| download | egawk-70bc75567b2ea3e0309b9171168bc1d2c1cadf43.tar.gz egawk-70bc75567b2ea3e0309b9171168bc1d2c1cadf43.tar.bz2 egawk-70bc75567b2ea3e0309b9171168bc1d2c1cadf43.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/Makefile.am | 4 | ||||
| -rw-r--r-- | extension/Makefile.in | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index ab3d62c0..295e72cc 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,10 @@ +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. + 2014-06-13 Paul Gortmaker <paul.gortmaker@windriver.com> * Makefile.am (uninstall-so): Came across below bug while cross diff --git a/extension/Makefile.am b/extension/Makefile.am index b6beaee3..b6c969ba 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -100,12 +100,12 @@ testext_la_LIBADD = $(MY_LIBS) install-data-hook: for i in $(pkgextension_LTLIBRARIES) ; do \ - $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ + rm -f $(DESTDIR)$(pkgextensiondir)/$$i ; \ done # Keep the uninstall check working: uninstall-so: - $(RM) $(DESTDIR)$(pkgextensiondir)/*.so + rm -f $(DESTDIR)$(pkgextensiondir)/*.so uninstall-recursive: uninstall-so diff --git a/extension/Makefile.in b/extension/Makefile.in index 294e4f88..692998bf 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -1231,12 +1231,12 @@ uninstall-man: uninstall-man3 install-data-hook: for i in $(pkgextension_LTLIBRARIES) ; do \ - $(RM) $(DESTDIR)$(pkgextensiondir)/$$i ; \ + rm -f $(DESTDIR)$(pkgextensiondir)/$$i ; \ done # Keep the uninstall check working: uninstall-so: - $(RM) $(DESTDIR)$(pkgextensiondir)/*.so + rm -f $(DESTDIR)$(pkgextensiondir)/*.so uninstall-recursive: uninstall-so |