# [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb' 4 messages from 2010-06-01 to 2010-06-02. Participants: Pavan Kumar Sunkara, Jakub Narebski, Junio C Hamano. Thread: https://gitlist.dev/t/23969 ## Pavan Kumar Sunkara, 2010-06-01 15:11 Subject: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb' Message-ID: <1275405080-17326-1-git-send-email-pavan.sss1991@gmail.com> URL: https://gitlist.dev/e/1275405080-17326-1-git-send-email-pavan.sss1991%40gmail.com ``` 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 --- 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 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, 2010-06-01 19:50 Subject: Re: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb' Message-ID: <201006012150.02970.jnareb@gmail.com> URL: https://gitlist.dev/e/201006012150.02970.jnareb%40gmail.com In-Reply-To: <1275405080-17326-1-git-send-email-pavan.sss1991@gmail.com> ``` 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 For what it is worth: Acked-by: Jakub Narebski (But I have not tested it!) > --- > 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.... > > 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. > 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, 2010-06-02 04:31 Subject: Re: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb' Message-ID: <7vfx16qcmm.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vfx16qcmm.fsf%40alter.siamese.dyndns.org In-Reply-To: <201006012150.02970.jnareb@gmail.com> ``` Jakub Narebski writes: > 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 > > For what it is worth: > > Acked-by: Jakub Narebski > > (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, 2010-06-02 14:49 Subject: Re: [PATCH] Makefile: Use $(sharedir)/gitweb for target 'install-gitweb' Message-ID: URL: https://gitlist.dev/e/AANLkTinIaY65N_DyDq6RrS6AyLeksL_ZfiawwDZySzB3%40mail.gmail.com In-Reply-To: <7vfx16qcmm.fsf@alter.siamese.dyndns.org> ``` > > 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. ```