From 62cf5126cd25e3d7e67daefb55d69c8e9526dc86 Mon Sep 17 00:00:00 2001
From: gdt <gdt@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Mon, 23 Oct 2006 14:58:05 +0000
Subject: Search for rm, and substitute it. Avoids assumption that make
predefines RM (BSD make does not).
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3835 221aa14e-8319-0410-a670-987f0aec2ac5
---
gr-howto-write-a-block/Makefile.common | 5 +++++
gr-howto-write-a-block/configure.ac | 1 +
gr-howto-write-a-block/doc/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
(limited to 'gr-howto-write-a-block')
diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common
index 31a31232a7..0160c354a2 100644
--- a/gr-howto-write-a-block/Makefile.common
+++ b/gr-howto-write-a-block/Makefile.common
@@ -36,3 +36,8 @@ grpyexecdir = $(pyexecdir)/gnuradio
# swig flags
SWIGPYTHONFLAGS = -fvirtual -python -modern
SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
+
+# Don't assume that make predefines $(RM), because BSD make does
+# not. We define it now in configure.ac using AM_PATH_PROG, but now
+# here have to add a -f to be like GNU make.
+RM=$(RM_PROG) -f
diff --git a/gr-howto-write-a-block/configure.ac b/gr-howto-write-a-block/configure.ac
index 7035599d53..9cf72f0930 100644
--- a/gr-howto-write-a-block/configure.ac
+++ b/gr-howto-write-a-block/configure.ac
@@ -36,6 +36,7 @@ GR_PROG_AS
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_PATH_PROG([RM_PROG], [rm])
AC_LIBTOOL_WIN32_DLL
AC_ENABLE_SHARED dnl do build shared libraries
diff --git a/gr-howto-write-a-block/doc/Makefile.am b/gr-howto-write-a-block/doc/Makefile.am
index 07e6f59613..5ca6a5a394 100644
--- a/gr-howto-write-a-block/doc/Makefile.am
+++ b/gr-howto-write-a-block/doc/Makefile.am
@@ -72,7 +72,7 @@ howto_square2_ff.h.xml: $(top_srcdir)/src/lib/howto_square2_ff.h make_numbered_l
# ----------------------------------------------------------------
clean:
- -rm -f $(TARGETS) $(BUILT_XML_FILES)
+ -${RM} -f $(TARGETS) $(BUILT_XML_FILES)
%.html : %.xml
xmlto html-nochunks $<
--
cgit v1.2.3