--- rxvt-unicode/src/Makefile.in	2007/06/09 10:28:56	1.91
+++ rxvt-unicode/src/Makefile.in	2007/06/13 12:42:28	1.98
@@ -10,9 +10,7 @@
 CC = @CC@
 CXX = @CXX@
 CPP = @CPP@
-MV = @MV@
 CP = @CP@
-LN = @LN@
 SED = @SED@
 ECHO = @ECHO@
 PERL = @PERL@
@@ -24,20 +22,14 @@
 LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
 LIBS = @LIBS@
-DINCLUDE = @DINCLUDE@
-DLIB = @DLIB@
 XINC = @X_CFLAGS@ @XPM_CFLAGS@  @LIBAFTERIMAGE_CFLAGS@
 XLIB = @X_LIBS@ @XPM_LIBS@  @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@
-COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
+CXXLIB = @CXXLIB@
+COMPILE = $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(XINC) -I.. -I$(srcdir) -I.
 LINK = @LINKER@ $(LDFLAGS)
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
-.PATH:		@srcdir@
-
-top_builddir = ..
-basedir = ..
-thisdir = src
 
 DEBUG=-DDEBUG_STRICT
 
@@ -82,16 +74,16 @@
 all: allbin
 
 rxvt: rxvt.o $(COMMON)
-	$(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) $(DLIB) @PERLLIB@
-#	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
+	$(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) @PERLLIB@
+#	$(LIBTOOL) --mode=link $(LINK) rxvt.o librxvt.la $(LIBS) $(XLIB) -o $@
 
 rxvtd: rxvtd.o $(COMMON) $(COMMON_DAEMON)
-	$(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) $(DLIB) @PERLLIB@
-#	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) $(DLIB) -o $@
+	$(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) @PERLLIB@
+#	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) -o $@
 
 rxvtc: rxvtc.o $(COMMON_DAEMON) fdpass.o
-	$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o $(LIBS) $(DLIB)
-#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) $(DLIB) -o $@
+	$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o $(CXXLIB)
+#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(CXXLIB) -o $@
 
 #librxvt.la: $(LIBOBJS)
 #	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
@@ -112,13 +104,13 @@
 	rm -f rxvt rxvtc rxvtd perlxsi.c rxvtperl.C
 	rm -f *.o *.lo .libs/* librxvt.la tmpproto *.tmp
 
-realclean: clean
-	rm -f tags TAGS rxvtlib.h
+distclean: clean
+	rm -f Makefile rxvtlib.h
 
-cleandir: realclean
+realclean: distclean
+	rm -f tags TAGS
 
-distclean: realclean
-	rm -f Makefile
+cleandir: realclean
 
 install-perl:
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -133,7 +125,7 @@
 	$(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME)
 	$(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME)
 
-install: install-bin alldoc install-perl
+install: install-bin install-perl
 
 perlxsi.c: Makefile
 	$(PERL) -MExtUtils::Embed -e xsinit -- -std urxvt