[PATCHv5 6/6] gitweb: update INSTALL to use shorter make target

Mark Rada· Apr 1, 2010, 05:37 UTC · lore

Gitweb can be generated by the gitweb/gitweb.cgi target or the gitweb target. Since the gitweb target is shorter, I think it would be better to have new users be instructed to use it.

Signed-off-by: Mark Rada <marada@uwaterloo.ca>

---

	No changes since previous version.

 gitweb/INSTALL |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/gitweb/INSTALL b/gitweb/INSTALL
index a79a183..f4212cf 100644
--- a/gitweb/INSTALL
+++ b/gitweb/INSTALL
@@ -2,12 +2,11 @@ GIT web Interface (gitweb) Installation
 =======================================
 
 First you have to generate gitweb.cgi from gitweb.perl using
-"make gitweb/gitweb.cgi", then copy appropriate files (gitweb.cgi,
-gitweb.js, gitweb.css, git-logo.png and git-favicon.png) to their
-destination. For example if git was (or is) installed with /usr prefix,
-you can do
+"make gitweb", then copy appropriate files (gitweb.cgi, gitweb.js,
+gitweb.css, git-logo.png and git-favicon.png) to their destination.
+For example if git was (or is) installed with /usr prefix, you can do
 
-	$ make prefix=/usr gitweb/gitweb.cgi  ;# as yourself
+	$ make prefix=/usr gitweb.cgi         ;# as yourself
 	# cp gitweb/git* /var/www/cgi-bin/    ;# as root
 
 Alternatively you can use autoconf generated ./configure script to
@@ -16,7 +15,7 @@ instead
 
 	$ make configure                     ;# as yourself
 	$ ./configure --prefix=/usr          ;# as yourself
-	$ make gitweb/gitweb.cgi             ;# as yourself
+	$ make gitweb.cgi                    ;# as yourself
 	# cp gitweb/git* /var/www/cgi-bin/   ;# as root
 
 The above example assumes that your web server is configured to run
@@ -32,8 +31,7 @@ file for gitweb (in gitweb/README).
 
 - There are many configuration variables which affect building of
   gitweb.cgi; see "default configuration for gitweb" section in main
-  (top dir) Makefile, and instructions for building gitweb/gitweb.cgi
-  target.
+  (top dir) Makefile, and instructions for building gitweb target.
 
   One of the most important is where to find the git wrapper binary. Gitweb
   tries to find the git wrapper at $(bindir)/git, so you have to set $bindir
@@ -86,7 +84,7 @@ Build example
 	     GITWEB_LOGO="/gitweb/git-logo.png" \
 	     GITWEB_FAVICON="/gitweb/git-favicon.png" \
 	     bindir=/usr/local/bin \
-	     gitweb/gitweb.cgi
+             gitweb.cgi
 
 	cp -fv ~/git/gitweb/gitweb.{cgi,js,css} \
 	       ~/git/gitweb/git-{favicon,logo}.png \

-- 
1.7.0.3.436.g45b2d

Jakub Narebski· Apr 1, 2010, 12:25 UTC · re: Mark Rada · lore

Re: [PATCHv5 6/6] gitweb: update INSTALL to use shorter make target

On Thu, 1 Apr 2010, Mark Rada wrote:

> Gitweb can be generated by the gitweb/gitweb.cgi target or the gitweb
> target. Since the gitweb target is shorter, I think it would be better
> to have new users be instructed to use it.

Good idea.

> -	$ make prefix=/usr gitweb/gitweb.cgi  ;# as yourself
> +	$ make prefix=/usr gitweb.cgi         ;# as yourself
>  	# cp gitweb/git* /var/www/cgi-bin/    ;# as root

But it should read

- $ make prefix=/usr gitweb/gitweb.cgi ;# as yourself + $ make prefix=/usr gitweb ;# as yourself

The target is "gitweb", not "gitweb.cgi"

Show 7 quoted lines

>  Alternatively you can use autoconf generated ./configure script to
> @@ -16,7 +15,7 @@ instead
>  
>  	$ make configure                     ;# as yourself
>  	$ ./configure --prefix=/usr          ;# as yourself
> -	$ make gitweb/gitweb.cgi             ;# as yourself
> +	$ make gitweb.cgi                    ;# as yourself

Same here.

Show 6 quoted lines

> @@ -86,7 +84,7 @@ Build example
>  	     GITWEB_LOGO="/gitweb/git-logo.png" \
>  	     GITWEB_FAVICON="/gitweb/git-favicon.png" \
>  	     bindir=/usr/local/bin \
> -	     gitweb/gitweb.cgi
> +             gitweb.cgi

Same here.  Also spaces in place of TAB.

-- 
Jakub Narebski
Poland