Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index e6b64f43949aba391a411c31b1cf57a0c8b56c2e..30df628b27d9fda67fbf69ecf17d8ae857edb4f8 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,14 +1,15 @@
 #!/usr/bin/perl
 package IkiWiki;
 
 #!/usr/bin/perl
 package IkiWiki;
 

+no lib '.';

 use warnings;
 use strict;
 use warnings;
 use strict;

-use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use FindBin; use lib $FindBin::Bin; # For use in nonstandard directory, munged by Makefile.

 use IkiWiki 3.00;
 
 sub usage () {
        die gettext("usage: ikiwiki [options] source dest"), "\n",
 use IkiWiki 3.00;
 
 sub usage () {
        die gettext("usage: ikiwiki [options] source dest"), "\n",

-           gettext("       ikiwiki --setup configfile"), "\n";
+           gettext("       ikiwiki --setup my.setup [options]"), "\n";

 }
 
 sub setup (@) {
 }
 
 sub setup (@) {