--- rxvt-unicode/src/Makefile.in	2012/09/21 23:26:20	1.171
+++ rxvt-unicode/src/Makefile.in	2013/10/12 08:36:36	1.176
@@ -10,7 +10,7 @@
 man1ext = 1
 man3dir = @mandir@/man3
 man3ext = 3
-PODOPTS = quotes => q<"> , center => q<RXVT-UNICODE>, release => q<$(RXVTNAME)-$(VERSION)>
+PODOPTS = quotes => q<"> , center => q<RXVT-UNICODE>, release => q<$(VERSION)>
 CXX = @CXX@
 PERL = @PERL@
 INSTALL = @INSTALL@
@@ -105,22 +105,22 @@
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(man1dir)
 @IF_PERL@	$(INSTALL) -d $(DESTDIR)$(man3dir)
 @IF_PERL@	$(INSTALL_DATA) $(srcdir)/urxvt.pm $(DESTDIR)$(libdir)/urxvt/urxvt.pm
-@IF_PERL@	cd $(srcdir)/perl; \
-@IF_PERL@	for ext in *; do \
+@IF_PERL@	for ext in $(srcdir)/perl/*; do \
 @IF_PERL@	   test -f "$$ext" || continue; \
+@IF_PERL@	   base="$${ext##*/}"; \
 @IF_PERL@	   $(INSTALL_DATA) "$$ext" $(DESTDIR)$(libdir)/urxvt/perl/; \
 @IF_PERL@	   < "$$ext" \
-@IF_PERL@	   $(PERL) -MPod::Man -e '(new Pod::Man name => "'rxvt-$$ext'", $(PODOPTS))->parse_from_file' \
+@IF_PERL@	   $(PERL) -MPod::Man -e '(new Pod::Man name => "'urxvt-$$base'", $(PODOPTS))->parse_from_file' \
 @IF_PERL@	   > ../mantmp; \
-@IF_PERL@	   test -s ../mantmp && $(INSTALL_DATA) ../mantmp $(DESTDIR)$(man1dir)/$(RXVTNAME)-$$ext.$(man1ext); \
+@IF_PERL@	   test -s ../mantmp && $(INSTALL_DATA) ../mantmp $(DESTDIR)$(man1dir)/$(RXVTNAME)-$$base.$(man1ext); \
 @IF_PERL@	   < "$$ext" $(PERL) -ne '<>, (print <> . "\n"), exit if /^=head1/' >&3; \
-@IF_PERL@	done 3>../manlst
-@IF_PERL@	cat ../doc/extensions.pod.top manlst ../doc/extensions.pod.bot | \
+@IF_PERL@	done 3>manlst
+@IF_PERL@	cat $(srcdir)/../doc/extensions.pod.top manlst $(srcdir)/../doc/extensions.pod.bot | \
 @IF_PERL@	$(PERL) -MPod::Man -e '(new Pod::Man name => "$(RXVTNAME)-extensions", $(PODOPTS))->parse_from_file' \
 @IF_PERL@	> mantmp
 @IF_PERL@	$(INSTALL_DATA) mantmp $(DESTDIR)$(man1dir)/$(RXVTNAME)-extensions.$(man1ext)
-@IF_PERL@	< urxvt.pm \
-@IF_PERL@	$(PERL) -MPod::Man -e '(new Pod::Man name => "$(RXVTNAME)perl", $(PODOPTS))->parse_from_file' \
+@IF_PERL@	< $(srcdir)/urxvt.pm \
+@IF_PERL@	$(PERL) -MPod::Man -e '(new Pod::Man name => "$(RXVTNAME)perl", section => 3, $(PODOPTS))->parse_from_file' \
 @IF_PERL@	> mantmp
 @IF_PERL@	$(INSTALL_DATA) mantmp $(DESTDIR)$(man3dir)/$(RXVTNAME)perl.$(man3ext)