threads / patch / 23969

patchMakefile: Use $(sharedir)/gitweb for target 'install-gitweb'

Subject: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

## tl;dr

4 messages between Jun 1, 2010 and Jun 2, 2010. Diffs are folded; open one to read it.

replies: 3people: 3as markdown or json

Pavan Kumar Sunkara· Jun 1, 2010, 15:11 UTC · lore

Export gitwebdir variable so that when user types the command 'make install-gitweb', gitweb is installed in $(sharedir)/gitweb rather than /var/www/cgi-bin. Now, $(sharedir)/gitweb is default for both 'install' and 'install-gitweb' targets.

Remove 'gitwebdir=$(gitwebdir_SQ)' from gitweb part of 'install' target which is unneccessary now.

Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to Makefile +2 −2

diff --git a/Makefile b/Makefile
index 8f011a5..32e3146 100644
--- a/Makefile
+++ b/Makefile
@@ -294,7 +294,7 @@ lib = lib
 # DESTDIR=
 pathsep = :
 
-export prefix bindir sharedir sysconfdir
+export prefix bindir sharedir gitwebdir sysconfdir
 
 CC = gcc
 AR = ar
@@ -2049,7 +2049,7 @@ install: all
 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
 ifndef NO_PERL
 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
-	$(MAKE) -C gitweb gitwebdir=$(gitwebdir_SQ) install
+	$(MAKE) -C gitweb install
 endif
 ifndef NO_PYTHON
 	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install

-- 
1.7.1.447.g40f7.dirty

Jakub Narebski· Jun 1, 2010, 19:50 UTC · re: Pavan Kumar Sunkara · lore

Re: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

On Tue, 1 June 2010, Pavan Kumar Sunkara wrote:

Show 9 quoted lines

> Export gitwebdir variable so that when user types the command
> 'make install-gitweb', gitweb is installed in $(sharedir)/gitweb
> rather than /var/www/cgi-bin. Now, $(sharedir)/gitweb is default
> for both 'install' and 'install-gitweb' targets.
> 
> Remove 'gitwebdir=$(gitwebdir_SQ)' from gitweb part of 'install'
> target which is unneccessary now.
> 
> Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>

For what it is worth:

Acked-by: Jakub Narebski <jnareb@gmail.com>

(But I have not tested it!)

Show 14 quoted lines

> ---
>  Makefile |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 8f011a5..32e3146 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -294,7 +294,7 @@ lib = lib
>  # DESTDIR=
>  pathsep = :
>  
> -export prefix bindir sharedir sysconfdir
> +export prefix bindir sharedir gitwebdir sysconfdir

Nitpick: why not

  +export prefix bindir sharedir sysconfdir gitwebdir

i.e. have 'gitwebdir' last?  Not that it matters, though....

Show 9 quoted lines

>  
>  CC = gcc
>  AR = ar
> @@ -2049,7 +2049,7 @@ install: all
>  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
>  ifndef NO_PERL
>  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
> -	$(MAKE) -C gitweb gitwebdir=$(gitwebdir_SQ) install
> +	$(MAKE) -C gitweb install

Nice.

Show 7 quoted lines

>  endif
>  ifndef NO_PYTHON
>  	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
> -- 
> 1.7.1.447.g40f7.dirty
> 
>

-- 
Jakub Narebski
Poland

Junio C Hamano· Jun 2, 2010, 04:31 UTC · re: Jakub Narebski · lore

Re: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

Jakub Narebski <jnareb@gmail.com> writes:

Show 17 quoted lines

> On Tue, 1 June 2010, Pavan Kumar Sunkara wrote:
>
>> Export gitwebdir variable so that when user types the command
>> 'make install-gitweb', gitweb is installed in $(sharedir)/gitweb
>> rather than /var/www/cgi-bin. Now, $(sharedir)/gitweb is default
>> for both 'install' and 'install-gitweb' targets.
>> 
>> Remove 'gitwebdir=$(gitwebdir_SQ)' from gitweb part of 'install'
>> target which is unneccessary now.
>> 
>> Signed-off-by: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
>
> For what it is worth:
>
> Acked-by: Jakub Narebski <jnareb@gmail.com>
>
> (But I have not tested it!)

I am wondering if we would also want to do something with this line

    gitwebdir ?= /var/www/cgi-bin

in gitweb/Makefile. This is orthogonal to the patch under discussion does, though.

Pavan Kumar Sunkara· Jun 2, 2010, 14:49 UTC · re: Junio C Hamano · lore

Re: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

Show 9 quoted lines

>
> I am wondering if we would also want to do something with this line
>
>    gitwebdir ?= /var/www/cgi-bin
>
> in gitweb/Makefile.  This is orthogonal to the patch under discussion
> does, though.
>
>

Well, Let us say that we use /var/www/cgi-bin as default if user downloads only gitweb and install it. If he is installing git, then gitweb needs to be installed in $(sharedir)/gitweb. Putting it as default in main Makefile is supported.

So, It won't be orthogonal to the patch.

Thanks, Pavan.