--- rxvt-unicode/Makefile.in	2007/06/13 11:30:42	1.26
+++ rxvt-unicode/Makefile.in	2011/11/27 13:50:03	1.36
@@ -15,9 +15,6 @@
 man3ext = 3
 man7dir = @mandir@/man7
 man7ext = 7
-CP = @CP@
-SED = @SED@
-ECHO = @ECHO@
 PERL = @PERL@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL@ -m 755
@@ -33,42 +30,32 @@
 
 subdirs = src doc
 
-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
+$(RECURSIVE_TARGETS):
+	@for I in $(subdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
 
 distclean realclean: distclean-local
 
-clean distclean realclean:
-	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
-
 #
 # entry points for other programs
 #
 rxvt:
-	(cd src; ${MAKE})
+	(cd src; $(MAKE))
 
 #-------------------------------------------------------------------------
-configure: configure.ac aclocal.m4 config.h.in
+configure: configure.ac aclocal.m4 libev/libev.m4 libptytty/ptytty.m4
 	cd $(srcdir); ./autogen.sh
 
 config.status:
 	if test -x config.status; then config.status --recheck; \
 	else $(SHELL) configure; fi
 
-config.h.in: configure.ac
+config.h.in: configure.ac aclocal.m4 libev/libev.m4 libptytty/ptytty.m4
 	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"
 
@@ -78,7 +65,7 @@
 cleandir: realclean
 
 distclean-local:
-	rm -f *~ config.cache config.h config.log config.status libtool
+	rm -f config.cache config.h config.log config.status
 	rm -f Makefile
 
 distdir:
@@ -86,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