--- rxvt-unicode/Makefile.in	2006/01/17 12:14:27	1.16
+++ rxvt-unicode/Makefile.in	2007/06/08 20:04:10	1.19
@@ -19,8 +19,6 @@
 CXX = @CXX@
 CPP = @CPP@
 MV = @MV@
-RM = @RM@
-RMF = @RM@ -f
 CP = @CP@
 LN = @LN@
 SED = @SED@
@@ -58,7 +56,7 @@
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
-MKDIR = $(srcdir)/autoconf/mkinstalldirs
+MKDIR = $(srcdir)/mkinstalldirs
 
 #-------------------------------------------------------------------------
 
@@ -66,11 +64,11 @@
 	@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
 
 #
@@ -83,17 +81,15 @@
 	(cd src/test; ${MAKE} tests)
 
 #-------------------------------------------------------------------------
-configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/config.h.in
-	cd $(srcdir);
-	./.prebuild
+configure: configure.ac aclocal.m4 config.h.in
+	cd $(srcdir); ./autogen.sh
 
 config.status:
 	if test -x config.status; then config.status --recheck; \
 	else $(SHELL) configure; fi
 
-autoconf/config.h.in: autoconf/configure.in
-	cd $(srcdir);
-	./.prebuild
+config.h.in: configure.ac
+	cd $(srcdir); ./autogen.sh
 
 installdirs:
 	$(MKDIR) $(DESTDIR)$(bindir)
@@ -116,10 +112,10 @@
 # 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)
-	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
-	(cd $(srcdir); $(RMF) Makefile)
-
+	(cd $(srcdir); rm -f *~ config.cache config.h config.log config.status libtool rxvtlib.h)
+	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@; rm -f Makefile) || exit 1; done
+	rm -f Makefile
+    
 distdir:
 	cd doc && $(MAKE) distdepend
 	cd src && $(MAKE) depend