--- rxvt-unicode/doc/Makefile.in	2006/01/16 18:07:12	1.27
+++ rxvt-unicode/doc/Makefile.in	2007/06/07 15:24:42	1.35
@@ -15,34 +15,14 @@
 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)
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -56,27 +36,33 @@
 
 #-------------------------------------------------------------------------
 
-all:
-
 SEDREPLACE = -e 's%@@RXVT_VERSION@@%$(VERSION)%g;'	\
 	     -e 's%@@RXVT_NAME@@%$(RXVTNAME)%g;'	\
 	     -e 's%@@RXVT_DATE@@%$(DATE)%g;'		\
-	     -e 's%@@RXVT_LIBDIR@@%$(libdir)%g;'
+	     -e 's%@@RXVT_LIBDIR@@%$(libdir)%g;'	\
+	     -e 's%@@URXVT_NAME@@%urxvt%g;'
+
+all:
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvt.1.man.in >rxvt.1.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvtc.1.man.in >rxvtc.1.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvtd.1.man.in >rxvtd.1.man
+	$(SED) $(SEDREPLACE) < $(srcdir)/rxvt.7.man.in >rxvt.7.man
+@IF_PERL@	$(SED) $(SEDREPLACE) < $(srcdir)/rxvtperl.3.man.in >rxvtperl.3.man
 
 rxvtperl.3.pod: ../src/urxvt.pm
-	cp $< $@
+	$(CP) $< $@
 
 %.tbl: %.pod
-	./podtbl <$< >$@
+	$(srcdir)/podtbl <$< >$@
 
 %.1.man.in: %.1.tbl
-	pod2man -n rxvt -r"$(VERSION)" -q\" -s1 -c "RXVT-UNICODE" <$< >$@
+	pod2man -n @@RXVT_NAME@@ -r"$(VERSION)" -q\" -s1 -c "RXVT-UNICODE" <$< >$@
 
 %.3.man.in: %.3.tbl
-	pod2man -n rxvt -r"$(VERSION)" -q\" -s3 -c "RXVT-UNICODE" <$< >$@
+	pod2man -n @@RXVT_NAME@@ -r"$(VERSION)" -q\" -s3 -c "RXVT-UNICODE" <$< >$@
 
 %.7.man.in: %.7.tbl
-	pod2man -n rxvt -r"$(VERSION)" -q\" -s7 -c "RXVT-UNICODE" <$< >$@
+	pod2man -n @@RXVT_NAME@@ -r"$(VERSION)" -q\" -s7 -c "RXVT-UNICODE" <$< >$@
 
 %.html: %.tbl
 	$(SED) $(SEDREPLACE) <$< | pod2html >$@
@@ -88,7 +74,7 @@
 	$(SED) $(SEDREPLACE) <$< | podselect -section "CONFIGURE OPTIONS" | pod2text >$@
 
 ../README.FAQ: rxvt.7.tbl
-	$(SED) $(SEDREPLACE) <$< | podselect -section "FREQUENTLY ASKED QUESTIONS" | pod2text >$@
+	$(SED) $(SEDREPLACE) <$< | podselect -section "RXVT-UNICODE\/URXVT FREQUENTLY ASKED QUESTIONS" | pod2text >$@
 
 tags allbin:
 
@@ -96,17 +82,17 @@
 	rxvt.1.txt    rxvt.7.txt    rxvtc.1.txt    rxvtd.1.txt    rxvtperl.3.txt \
 	rxvt.1.html   rxvt.7.html   rxvtc.1.html   rxvtd.1.html   rxvtperl.3.html \
 	../README.configure ../README.FAQ
-	infocmp -C rxvt-unicode >etc/rxvt-unicode.termcap
+	infocmp -C rxvt-unicode >$(srcdir)/etc/rxvt-unicode.termcap
 
 clean:
-	$(RMF) *~
+	rm -f *~
 
 realclean: clean
-	$(RMF) tags ../README.configure ../README.FAQ
-	$(RMF) rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in
-	$(RMF) rxvt.1.man    rxvt.7.man    rxvtc.1.man    rxvtd.1.man   
-	$(RMF) rxvt.1.txt    rxvt.7.txt    rxvtc.1.txt    rxvtd.1.txt
-	$(RMF) rxvt.1.html   rxvt.7.html   rxvtc.1.html   rxvtd.1.html
+	rm -f tags ../README.configure ../README.FAQ
+	rm -f rxvt.1.man.in rxvt.7.man.in rxvtc.1.man.in rxvtd.1.man.in
+	rm -f rxvt.1.man    rxvt.7.man    rxvtc.1.man    rxvtd.1.man   
+	rm -f rxvt.1.txt    rxvt.7.txt    rxvtc.1.txt    rxvtd.1.txt
+	rm -f rxvt.1.html   rxvt.7.html   rxvtc.1.html   rxvtd.1.html
 
 cleandir: realclean
 
@@ -114,22 +100,14 @@
 
 install:
 	$(INSTALL) -d $(DESTDIR)$(man1dir)
-	$(SED) $(SEDREPLACE) < rxvt.1.man.in >rxvt.1.man
 	$(INSTALL_DATA) rxvt.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME).$(man1ext)
-	$(SED) $(SEDREPLACE) < rxvtc.1.man.in >rxvtc.1.man
 	$(INSTALL_DATA) rxvtc.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)c.$(man1ext)
-	$(SED) $(SEDREPLACE) < rxvtd.1.man.in >rxvtd.1.man
 	$(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext)
 	$(INSTALL) -d $(DESTDIR)$(man7dir)
-	$(SED) $(SEDREPLACE) < rxvt.7.man.in >rxvt.7.man
 	$(INSTALL_DATA) rxvt.7.man $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(man3dir)
-@IF_PERL@	$(SED) $(SEDREPLACE) < rxvtperl.3.man.in >rxvtperl.3.man
 @IF_PERL@	$(INSTALL_DATA) rxvtperl.3.man $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext)
-	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ etc/rxvt-unicode.terminfo; fi; fi
-
-uninstall:
-	-(cd $(mandir); $(RMF) $(RXVTNAME).$(manext) )
+	if test -x "@TIC@"; then if test -n "@TIC@"; then @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo; fi; fi
 
 distdepend: alldoc