gnURL: Fix doc generation, fix 'make dist'.

4 files changed, 10 insertions, 10 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 33c01535d..e9e97ef75 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -22,7 +22,7 @@
 ZSH_FUNCTIONS_DIR = @ZSH_FUNCTIONS_DIR@
 PERL = @PERL@
 
-ZSH_COMPLETION_FUNCTION_FILENAME = _curl
+ZSH_COMPLETION_FUNCTION_FILENAME = _gnurl
 
 all-local: $(ZSH_COMPLETION_FUNCTION_FILENAME)
 
diff --git a/scripts/log2changes.pl b/scripts/log2changes.pl
index 667daabf0..4e35e9cad 100755
--- a/scripts/log2changes.pl
+++ b/scripts/log2changes.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 
 # git log --pretty=fuller --no-color --date=short --decorate=full
 
@@ -32,7 +32,7 @@ while(<STDIN>) {
     if($l =~/^commit ([[:xdigit:]]*) ?(.*)/) {
         $co = $1;
         my $ref = $2;
-        if ($ref =~ /refs\/tags\/curl-([0-9_]*)/) {
+        if ($ref =~ /refs\/tags\/gnurl-([0-9_]*)/) {
             $tag = $1;
             $tag =~ tr/_/./;
         }
diff --git a/scripts/updatemanpages.pl b/scripts/updatemanpages.pl
index 6a58dbd42..e144bad11 100755
--- a/scripts/updatemanpages.pl
+++ b/scripts/updatemanpages.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |
diff --git a/scripts/zsh.pl b/scripts/zsh.pl
index f0d8c195f..5b5ad13e7 100755
--- a/scripts/zsh.pl
+++ b/scripts/zsh.pl
@@ -5,7 +5,7 @@
 use strict;
 use warnings;
 
-my $curl = $ARGV[0] || 'curl';
+my $gnurl = $ARGV[0] || 'gnurl';
 
 my $regex = '\s+(?:(-[^\s]+),\s)?(--[^\s]+)\s([^\s.]+)?\s+(.*)';
 my @opts = parse_main_opts('--help', $regex);
@@ -16,9 +16,9 @@ $opts_str .= qq{  $_ \\\n} foreach (@opts);
 chomp $opts_str;
 
 my $tmpl = <<"EOS";
-#compdef curl
+#compdef gnurl
 
-# curl zsh completion
+# gnurl zsh completion
 
 local curcontext="\$curcontext" state state_descr line
 typeset -A opt_args
@@ -78,11 +78,11 @@ sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s };
 
 sub call_curl {
     my ($cmd) = @_;
-    my $output = `"$curl" $cmd`;
+    my $output = `"$gnurl" $cmd`;
     if ($? == -1) {
-        die "Could not run curl: $!";
+        die "Could not run gnurl: $!";
     } elsif ((my $exit_code = $? >> 8) != 0) {
-        die "curl returned $exit_code with output:\n$output";
+        die "gnurl returned $exit_code with output:\n$output";
     }
     return split /\n/, $output;
 }