aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in2
-rw-r--r--extension/ChangeLog7
-rw-r--r--extension/Makefile.am4
-rw-r--r--extension/Makefile.in4
6 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 266b7532..fb1de2b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,12 @@
* field.c (rebuild_record): Is now extern instead of static.
Use OFS and OFSlen instead of the value of OFS_node.
+ 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.
+
2014-08-05 Arnold D. Robbins <arnold@skeeve.com>
Bug fix: For MPFR sqrt(), need to set precision of result to be
diff --git a/Makefile.am b/Makefile.am
index 6e5715d7..c14a39b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -176,7 +176,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) /tmp/tmp.sed /tmp/config.tmp
+ rm -f /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 d243df5b..5233b363 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1175,7 +1175,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) /tmp/tmp.sed /tmp/config.tmp
+ rm -f /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 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