summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2005-11-22 02:11:00 +0000
committerEric Anholt <anholt@freebsd.org>2005-11-22 02:11:00 +0000
commit594ca0966e8fd5992ebf95170cc42e19c698fec6 (patch)
tree1cfec40f1d97a568b27b3f91a918ac15fb95caf5
parent1c8c1179c0789e3e134d31a62dbb88bfdb594b26 (diff)
Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined.
-rw-r--r--ChangeLog5
-rw-r--r--hw/xfree86/utils/ioport/Makefile.am4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ed9829ce7..3f56381fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-21 Eric Anholt <anholt@FreeBSD.org>
+
+ * hw/xfree86/utils/ioport/Makefile.am:
+ Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined.
+
2005-11-20 Felix Kuehling <fxkuehl@gmx.de>
* configure.ac:
diff --git a/hw/xfree86/utils/ioport/Makefile.am b/hw/xfree86/utils/ioport/Makefile.am
index 4577fdacd..23f756917 100644
--- a/hw/xfree86/utils/ioport/Makefile.am
+++ b/hw/xfree86/utils/ioport/Makefile.am
@@ -45,12 +45,12 @@ ioport_PROGRAM_LINKS = inb inw inl outb outw outl
all-local:
@for i in $(ioport_PROGRAM_LINKS); do (set -x; \
- $(RM) $$i; $(LN_S) ioport $$i); \
+ rm -f $$i; $(LN_S) ioport $$i); \
done
install-exec-hook:
@for i in $(ioport_PROGRAM_LINKS); do (set -x; \
- $(RM) $(DESTDIR)$(bindir)/$$i; \
+ rm -f $(DESTDIR)$(bindir)/$$i; \
(cd $(DESTDIR)$(bindir); $(LN_S) ioport $$i)); \
done