From: ayin <ayin>
Date: Mon, 23 Jan 2006 09:56:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2e087f3f7fedd00e6a2c7a488748bb5add781b73;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Makefile.in b/Makefile.in
index cc3f4b61..4bd8d4f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,8 +19,6 @@ CC = @CC@
 CXX = @CXX@
 CPP = @CPP@
 MV = @MV@
-RM = @RM@
-RMF = @RM@ -f
 CP = @CP@
 LN = @LN@
 SED = @SED@
@@ -66,11 +64,11 @@ all allbin alldoc tags:
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 realclean: clean
-	$(RMF) config.h config.status config.log libtool
+	rm -f config.h config.status config.log libtool
 
 clean:
-	$(RMF) *~ config.cache
-	$(RMF) -r autom4te.cache
+	rm -f *~ config.cache
+	rm -f -r autom4te.cache
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 #
@@ -114,9 +112,9 @@ cleandir: realclean
 # In that case most of those commands do nothing, except cleaning *~
 # and cleaning source links.
 distclean:
-	(cd $(srcdir); $(RMF) *~ config.cache config.h config.log config.status libtool)
+	(cd $(srcdir); rm -f *~ config.cache config.h config.log config.status libtool)
 	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
-	(cd $(srcdir); $(RMF) Makefile)
+	(cd $(srcdir); rm -f Makefile)
 
 distdir:
 	cd doc && $(MAKE) distdepend
diff --git a/configure.ac b/configure.ac
index 32995fd3..b91011b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,7 +485,6 @@ AC_ARG_WITH(terminfo,
 dnl# --------------------------------------------------------------------------
 
 AC_PATH_PROG(MV, mv, mv)
-AC_PATH_PROG(RM, rm, rm)
 AC_PATH_PROG(CP, cp, cp)
 AC_PATH_PROG(LN, ln, ln)
 AC_PATH_PROG(SED, sed, sed)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ece19f8b..b3692412 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -15,8 +15,6 @@ man3dir = @mandir@/man3
 man3ext = 3
 man7dir = @mandir@/man7
 man7ext = 7
-RM = @RM@
-RMF = @RM@ -f
 CP = @CP@
 LN = @LN@
 SED = @SED@
@@ -81,14 +79,14 @@ alldoc:	rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in rxvtperl.3.man
 	infocmp -C rxvt-unicode >etc/rxvt-unicode.termcap
 
 clean:
-	$(RMF) *~
+	rm -f *~
 
 realclean: clean
-	$(RMF) tags ../README.configure ../README.FAQ
-	$(RMF) rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in
-	$(RMF) rxvt.1.man    rxvt.7.man    rxvtc.1.man    rxvtd.1.man   
-	$(RMF) rxvt.1.txt    rxvt.7.txt    rxvtc.1.txt    rxvtd.1.txt
-	$(RMF) rxvt.1.html   rxvt.7.html   rxvtc.1.html   rxvtd.1.html
+	rm -f tags ../README.configure ../README.FAQ
+	rm -f rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in
+	rm -f rxvt.1.man    rxvt.7.man    rxvtc.1.man    rxvtd.1.man   
+	rm -f rxvt.1.txt    rxvt.7.txt    rxvtc.1.txt    rxvtd.1.txt
+	rm -f rxvt.1.html   rxvt.7.html   rxvtc.1.html   rxvtd.1.html
 
 cleandir: realclean
 
@@ -111,7 +109,7 @@ install:
 	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ etc/rxvt-unicode.terminfo; fi; fi
 
 uninstall:
-	-(cd $(mandir); $(RMF) $(RXVTNAME).$(manext) )
+	-(cd $(mandir); rm -f $(RXVTNAME).$(manext) )
 
 distdepend: alldoc
 
diff --git a/src/Makefile.in b/src/Makefile.in
index cff88d2d..1075e0bd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -11,8 +11,6 @@ CC = @CC@
 CXX = @CXX@
 CPP = @CPP@
 MV = @MV@
-RM = @RM@
-RMF = @RM@ -f
 CP = @CP@
 LN = @LN@
 SED = @SED@
@@ -115,16 +113,16 @@ allbin: rxvt rxvtd rxvtc
 alldoc:
 
 clean:
-	$(RMF) rxvt rxvtc rxvtd perlxsi.c rxvtperl.C
-	$(RMF) *.o *.lo .libs/* librxvt.la tmpproto *.tmp
+	rm -f rxvt rxvtc rxvtd perlxsi.c rxvtperl.C
+	rm -f *.o *.lo .libs/* librxvt.la tmpproto *.tmp
 
 realclean: clean
-	$(RMF) tags TAGS librxvt.h
+	rm -f tags TAGS librxvt.h
 
 cleandir: realclean
 
 distclean: realclean
-	(cd $(srcdir); $(RMF) Makefile)
+	(cd $(srcdir); rm -f Makefile)
 
 install-perl:
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(libdir)