--- rxvt-unicode/Makefile.in	2006/01/07 20:24:07	1.13
+++ rxvt-unicode/Makefile.in	2007/12/28 20:57:52	1.32
@@ -1,69 +1,60 @@
 # ./Makefile.in			-*- Makefile -*-
-@MCOMMON@
+
+DATE=@DATE@
+VERSION=@VERSION@
+RXVTNAME=@RXVTNAME@
+SHELL = /bin/sh
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
+man1dir = @mandir@/man1
+man1ext = 1
+man3dir = @mandir@/man3
+man3ext = 3
+man7dir = @mandir@/man7
+man7ext = 7
+PERL = @PERL@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL@ -m 755
+INSTALL_DATA = @INSTALL@ -m 644
 
 VERNAME = rxvt-unicode-$(VERSION)
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
-.PATH:		@srcdir@
 
 first_rule: all
 dummy:
 
 subdirs = src doc
-allsubdirs = $(subdirs)
-
-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/Make.common.in autoconf/install-sh autoconf/mkinstalldirs \
-	autoconf/config.guess autoconf/config.sub \
-	autoconf/ltmain.sh \
 
-MKDIR = $(srcdir)/autoconf/mkinstalldirs
+RECURSIVE_TARGETS = all allbin alldoc tags clean distclean realclean install
 
 #-------------------------------------------------------------------------
 
-all allbin alldoc tags:
-	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
+$(RECURSIVE_TARGETS):
+	@for I in $(subdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
 
-realclean: clean
-	$(RMF) config.h config.status config.log libtool
-
-clean:
-	$(RMF) *~ config.cache
-	$(RMF) -r autom4te.cache
-	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
+distclean realclean: distclean-local
 
 #
 # entry points for other programs
 #
 rxvt:
-	(cd src; ${MAKE})
-
-tests:
-	(cd src/test; ${MAKE} tests)
+	(cd src; $(MAKE))
 
 #-------------------------------------------------------------------------
-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
-
-installdirs:
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(MKDIR) $(DESTDIR)$(mandir)
-
-install: installdirs
-	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; done
+config.h.in: configure.ac
+	cd $(srcdir); ./autogen.sh
 
 check: all
 	echo "no tests"
@@ -73,22 +64,16 @@
 
 cleandir: realclean
 
-# distclean goal is for making a clean source tree, but if you have run
-# configure from a different directory, then doesn't destroy all your
-# 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 autoconf/Make.common)
+distclean-local:
+	rm -f *~ config.cache config.h config.log config.status
+	rm -f Makefile
 
 distdir:
 	cd doc && $(MAKE) distdepend
 	cd src && $(MAKE) depend
 	rm -rf $(VERNAME)
 	mkdir $(VERNAME)
-	rsync -aR `cat MANIFEST` $(VERNAME)/.
+	rsync -aR --copy-unsafe-links `cat MANIFEST` $(VERNAME)/.
 
 tar.gz: distdir
 	tar cvf - $(VERNAME) | gzip -vf9 > $(VERNAME).tar.gz