--- rxvt-unicode/Makefile.in	2007/06/08 22:45:48	1.20
+++ rxvt-unicode/Makefile.in	2008/02/21 18:47:32	1.33
@@ -15,70 +15,35 @@
 man3ext = 3
 man7dir = @mandir@/man7
 man7ext = 7
-CC = @CC@
-CXX = @CXX@
-CPP = @CPP@
-MV = @MV@
-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)
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
-.PATH:		@srcdir@
 
 first_rule: all
 dummy:
 
 subdirs = src doc
-allsubdirs = $(subdirs)
 
-DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
-
-MKDIR = $(srcdir)/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
-
-realclean: clean
-	rm -f config.h config.status config.log libtool
+$(RECURSIVE_TARGETS):
+	@for I in $(subdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
 
-clean:
-	rm -f *~ config.cache
-	rm -f -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: configure.ac aclocal.m4 config.h.in
@@ -91,13 +56,6 @@
 config.h.in: configure.ac
 	cd $(srcdir); ./autogen.sh
 
-installdirs:
-	$(MKDIR) $(DESTDIR)$(bindir)
-	$(MKDIR) $(DESTDIR)$(mandir)
-
-install: installdirs
-	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; done
-
 check: all
 	echo "no tests"
 
@@ -106,14 +64,8 @@
 
 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:
-	rm -f *~ config.cache config.h config.log config.status libtool
-	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
+distclean-local:
+	rm -f config.cache config.h config.log config.status
 	rm -f Makefile
 
 distdir:
@@ -121,7 +73,7 @@
 	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