--- rxvt-unicode/Makefile.in	2006/01/07 20:24:07	1.13
+++ rxvt-unicode/Makefile.in	2006/01/17 12:14:27	1.16
@@ -1,5 +1,48 @@
 # ./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
+CC = @CC@
+CXX = @CXX@
+CPP = @CPP@
+MV = @MV@
+RM = @RM@
+RMF = @RM@ -f
+CP = @CP@
+LN = @LN@
+SED = @SED@
+AWK = @AWK@
+ECHO = @ECHO@
+CMP = @CMP@
+TBL = @TBL@
+PERL = @PERL@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL@ -m 755
+INSTALL_DATA = @INSTALL@ -m 644
+CXXFLAGS = @CXXFLAGS@ 
+CPPFLAGS = @CPPFLAGS@ @XPM_CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+DEFS = @DEFS@
+LIBS = @LIBS@
+DINCLUDE = @DINCLUDE@
+DLIB = @DLIB@
+XINC = @X_CFLAGS@ @XPM_CFLAGS@
+XLIB = @X_LIBS@ @XPM_LIBS@ -lX11 @X_EXTRA_LIBS@
+COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
+LINK = @LINKER@ $(LDFLAGS)
 
 VERNAME = rxvt-unicode-$(VERSION)
 
@@ -15,12 +58,6 @@
 
 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
 
 #-------------------------------------------------------------------------
@@ -81,7 +118,7 @@
 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)
+	(cd $(srcdir); $(RMF) Makefile)
 
 distdir:
 	cd doc && $(MAKE) distdepend