Don't generate texi2pod.pl, use it

Hrvoje Niksic <[email protected]> Wed, 22 Jun 2005 14:25:14 +0200
Newsgroups gmane.comp.web.wget.patches
Message-ID <[email protected]>
This patch modifies texi2pod.pl to use #!/usr/bin/env perl instead of
#!/usr/bin/perl directly.  This approach works more many Python
scripts and is likely to be portable to all systems we care about.  If
someone knows of a Unix-like system still in use where this doesn't
work, please let me know.

(Another reason why this wasn't done before was that I didn't know,
and still don't know, of a way to change the executable of a file in
the CVS repository without having shell access to the repository.
With subversion it's as simple as `svn propset svn:executable ON
texi2pod.pl'.)

This simplifies doc/Makefile.in somewhat, which is always a good thing
in my book.


2005-06-22  Hrvoje Niksic  <[email protected]>

	* texi2pod.pl: Locate perl using the "env" program, so we don't
	need to modify texi2pod.

	* Makefile.in (wget.pod): Work with texi2pod.pl directly instead
	of generating it from texi2pod.pl.in.

Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in	(revision 1743)
+++ doc/Makefile.in	(working copy)
@@ -48,7 +48,7 @@
 INSTALL_DATA = @INSTALL_DATA@
 RM = rm -f
 
-TEXI2POD     = texi2pod.pl
+TEXI2POD     = $(srcdir)/texi2pod.pl
 POD2MAN      = @POD2MAN@
 MAN          = wget.$(manext)
 WGETRC       = $(sysconfdir)/wgetrc
@@ -68,13 +68,9 @@
 wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
 	$(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
 
-$(TEXI2POD): $(srcdir)/$(TEXI2POD).in
-	sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@
-	chmod u+x $@
+wget.pod: $(srcdir)/wget.texi $(srcdir)/version.texi
+	$(TEXI2POD) $(srcdir)/wget.texi $@
 
-wget.pod: $(srcdir)/wget.texi $(TEXI2POD) $(srcdir)/version.texi
-	./$(TEXI2POD) $(srcdir)/wget.texi $@
-
 $(MAN): wget.pod
 	$(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@
 
@@ -166,7 +162,7 @@
 
 distclean: clean
 	$(RM) Makefile
-	$(RM) $(MAN) $(TEXI2POD)
+	$(RM) $(MAN)
 
 realclean: distclean
 	$(RM) wget.info*
Index: doc/texi2pod.pl
===================================================================
--- doc/texi2pod.pl	(revision 1743)
+++ doc/texi2pod.pl	(working copy)
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#! /usr/bin/env perl
 
 #   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
@@ -23,6 +23,8 @@
 # markup to Perl POD format.  It's intended to be used to extract
 # something suitable for a manpage from a Texinfo document.
 
+use warnings;
+
 $output = 0;
 $skipping = 0;
 %sects = ();

Property changes on: doc/texi2pod.pl
___________________________________________________________________
Name: svn:executable
   + *