--- rxvt-unicode/Makefile.in	2006/01/16 18:05:58	1.15
+++ rxvt-unicode/Makefile.in	2007/06/12 23:36:23	1.22
@@ -19,8 +19,6 @@
 CXX = @CXX@
 CPP = @CPP@
 MV = @MV@
-RM = @RM@
-RMF = @RM@ -f
 CP = @CP@
 LN = @LN@
 SED = @SED@
@@ -32,7 +30,7 @@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL@ -m 755
 INSTALL_DATA = @INSTALL@ -m 644
-CXXFLAGS = @CXXFLAGS@ 
+CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@ @XPM_CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
@@ -58,25 +56,16 @@
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
-DIST_CFG = autoconf/aclocal.m4 autoconf/xpm.m4 autoconf/libtool.m4 \
-	autoconf/configure.in  autoconf/config.h.in \
-	autoconf/install-sh autoconf/mkinstalldirs \
-	autoconf/config.guess autoconf/config.sub \
-	autoconf/ltmain.sh \
-
-MKDIR = $(srcdir)/autoconf/mkinstalldirs
+MKDIR = $(srcdir)/mkinstalldirs
 
 #-------------------------------------------------------------------------
 
 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
+distclean realclean: distclean-local
 
-clean:
-	$(RMF) *~ config.cache
-	$(RMF) -r autom4te.cache
+clean distclean realclean:
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 #
@@ -89,17 +78,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)
@@ -121,10 +108,9 @@
 # hardly compiled and linked stuff. That's why there is always $(srcdir)/
 # 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)
+distclean-local:
+	rm -f *~ config.cache config.h config.log config.status libtool
+	rm -f Makefile
 
 distdir:
 	cd doc && $(MAKE) distdepend