--- rxvt-unicode/Makefile.in	2003/11/24 17:28:07	1.1
+++ rxvt-unicode/Makefile.in	2005/12/27 11:30:29	1.12
@@ -1,7 +1,8 @@
 # ./Makefile.in			-*- Makefile -*-
-# $Id: Makefile.in,v 1.1 2003/11/24 17:28:07 pcg Exp $
 @MCOMMON@
 
+VERNAME = rxvt-unicode-$(VERSION)
+
 srcdir =	@srcdir@
 VPATH =		@srcdir@
 .PATH:		@srcdir@
@@ -9,8 +10,8 @@
 first_rule: all
 dummy:
 
-subdirs = src doc src/graphics src/test
-allsubdirs = W11 $(subdirs)
+subdirs = src doc
+allsubdirs = $(subdirs)
 
 DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
 
@@ -25,7 +26,6 @@
 #-------------------------------------------------------------------------
 
 all allbin alldoc tags:
-	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 realclean: clean
@@ -34,7 +34,6 @@
 clean:
 	$(RMF) *~ config.cache
 	$(RMF) -r autom4te.cache
-	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
 	@for I in ${subdirs}; do (cd $$I; ${MAKE} $@) || exit 1; done
 
 #
@@ -43,12 +42,6 @@
 rxvt:
 	(cd src; ${MAKE})
 
-clock:
-	(cd rclock; ${MAKE})
-
-graphics qplot:
-	(cd src/graphics; ${MAKE} qplot)
-
 tests:
 	(cd src/test; ${MAKE} tests)
 
@@ -70,9 +63,11 @@
 	$(MKDIR) $(DESTDIR)$(mandir)
 
 install: installdirs
-	@if test x@host_os@ = xcygwin; then (cd W11; ${MAKE} $@) || exit 1; fi
 	@for I in $(subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@) || exit 1; done
 
+check: all
+	echo "no tests"
+
 Makefiles:
 	$(SHELL) config.status
 
@@ -88,31 +83,20 @@
 	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
 	(cd $(srcdir); $(RMF) Makefile autoconf/Make.common)
 
-distdirs:
-	mkdir ../$(VERNAME);
-	mkdir ../$(VERNAME)/autoconf;
-	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@ || (echo "Failed to make distclean in $$I"; exit 0) ); done
-
-distcopy:
-	$(CP) -p $(DIST) ../$(VERNAME);
-	$(CP) -p $(DIST_CFG) ../$(VERNAME)/autoconf;
-	@for I in $(allsubdirs); do (cd $$I; $(MAKE) $@) || exit 1; done
-
-distrib: configure autoconf/config.h.in distdirs distcopy
-
-tar.gz:  ../$(VERNAME).tar.gz
-../$(VERNAME).tar.gz:
-	(cd ..; tar cvf - $(VERNAME) | gzip -f9 > $(VERNAME).tar.gz)
-
-tar.Z: ../$(VERNAME).tar.Z
-../$(VERNAME).tar.Z:
-	(cd ..; tar cvf - $(VERNAME) | compress > $(VERNAME).tar.Z)
-
-tar.bz2: ../$(VERNAME).tar.bz2
-../$(VERNAME).tar.bz2:
-	(cd ..; tar cvf - $(VERNAME) | bzip2 -f9 > $(VERNAME).tar.bz2)
+distdir:
+	cd doc && $(MAKE) distdepend
+	rm -rf $(VERNAME)
+	mkdir $(VERNAME)
+	rsync -aR `cat MANIFEST` $(VERNAME)/.
+
+tar.gz: distdir
+	tar cvf - $(VERNAME) | gzip -vf9 > $(VERNAME).tar.gz
+	rm -rf $(VERNAME)
+
+tar.bz2: distdir
+	tar cvf - $(VERNAME) | bzip2 -vf9 > $(VERNAME).tar.bz2
+	rm -rf $(VERNAME)
 
-uuencode: tar.gz
-	uuencode ../$(VERNAME).tar.gz $(VERNAME).tar.gz > ../$(VERNAME).tgz.uu
+dist: tar.bz2
 
 # ------------------------------------------------------------------------