[PATCHv2] gitweb: Improve installation instructions in gitweb/INSTALL

[Jakub Narebski <jnareb@gmail.com>]

Dnia wtorek 27. kwietnia 2010 22:40, Mark Rada napisał:
> On 10-04-27 4:33 PM, Jakub Narebski wrote:
> > +  The above instruction assumes that you didn't use JavaScript
> > +  minimizer or CSS minimizer.  If you use minimizers you need
> > +  to modify above instructions accordingly, which means pointing
> > +  GITWEB_CSS and GITWEB_JS to minified versions, and copying 
> > +  minified files.
> > +
> >  
> 
> Hmm, I believe I already put a message like this in the INSTALL
> file. Perhaps that message should be updated, too, or removed in
> place of your patch.
> 
> Looks like:
>  67 
>  68 - You can optionally generate minified versions of gitweb.js and gitweb.css
>  69   by defining the JSMIN and CSSMIN build configuration variables. By default
>  70   the non-minified versions will be used. NOTE: if you enable this option,
>  71   substitute gitweb.min.js and gitweb.min.css for all uses of gitweb.js and
>  72   gitweb.css in the help files.

How about this then:

-- >8 --
From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 27 Apr 2010 22:45:19 +0200
Subject: [PATCHv2] gitweb: Improve installation instructions in gitweb/INSTALL

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
 gitweb/INSTALL |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/gitweb/INSTALL b/gitweb/INSTALL
index cbdc136..1bfd9aa 100644
--- a/gitweb/INSTALL
+++ b/gitweb/INSTALL
@@ -7,7 +7,9 @@ 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             ;# as yourself
-	# cp gitweb/git* /var/www/cgi-bin/    ;# as root
+	# cp gitweb/*.cgi gitweb/*.css \
+	     gitweb/*.js  gitweb/*.png \
+	     /var/www/cgi-bin/                ;# as root
 
 Alternatively you can use autoconf generated ./configure script to
 set up path to git binaries (via config.mak.autogen), so you can write
@@ -16,7 +18,9 @@ instead
 	$ make configure                     ;# as yourself
 	$ ./configure --prefix=/usr          ;# as yourself
 	$ make gitweb                        ;# as yourself
-	# cp gitweb/git* /var/www/cgi-bin/   ;# as root
+	# cp gitweb/*.cgi gitweb/*.css \
+	     gitweb/*.js  gitweb/*.png \
+	     /var/www/cgi-bin/               ;# as root
 
 The above example assumes that your web server is configured to run
 [executable] files in /var/www/cgi-bin/ as server scripts (as CGI
@@ -74,9 +78,10 @@ file for gitweb (in gitweb/README).
 Build example
 ~~~~~~~~~~~~~
 
-- To install gitweb to /var/www/cgi-bin/gitweb/ when git wrapper
-  is installed at /usr/local/bin/git and the repositories (projects)
-  we want to display are under /home/local/scm, you can do
+- To install gitweb to /var/www/cgi-bin/gitweb/, when git wrapper
+  is installed at /usr/local/bin/git, the repositories (projects)
+  we want to display are under /home/local/scm, and you do not use
+  minifiers, you can do
 
 	make GITWEB_PROJECTROOT="/home/local/scm" \
 	     GITWEB_JS="/gitweb/gitweb.js" \
@@ -86,8 +91,8 @@ Build example
 	     bindir=/usr/local/bin \
 	     gitweb
 
-	cp -fv ~/git/gitweb/gitweb.{cgi,js,css} \
-	       ~/git/gitweb/git-{favicon,logo}.png \
+	cp -fv gitweb/gitweb.{cgi,js,css} \
+	       gitweb/git-{favicon,logo}.png \
 	     /var/www/cgi-bin/gitweb/
 
 
-- 
1.7.0.1