/[gentoo-x86]/dev-vcs/git/files/git-1.7.2-always-install-js.patch
Gentoo

Contents of /dev-vcs/git/files/git-1.7.2-always-install-js.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Jul 22 16:56:07 2010 UTC (4 years, 5 months ago) by robbat2
Branch: MAIN
Version bump.
(Portage version: 2.2_rc67/cvs/Linux x86_64)

1 diff -Nuar --exclude '*.rej' --exclude '*.orig' git-1.7.2.orig/Makefile git-1.7.2/Makefile
2 --- git-1.7.2.orig/Makefile 2010-07-21 21:35:25.000000000 +0000
3 +++ git-1.7.2/Makefile 2010-07-22 16:52:22.994872806 +0000
4 @@ -1650,17 +1650,16 @@
5 $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
6
7 ifdef JSMIN
8 -GITWEB_PROGRAMS += gitweb/static/gitweb.min.js
9 GITWEB_JS = gitweb/static/gitweb.min.js
10 else
11 GITWEB_JS = gitweb/static/gitweb.js
12 endif
13 ifdef CSSMIN
14 -GITWEB_PROGRAMS += gitweb/static/gitweb.min.css
15 GITWEB_CSS = gitweb/static/gitweb.min.css
16 else
17 GITWEB_CSS = gitweb/static/gitweb.css
18 endif
19 +GITWEB_PROGRAMS += $(GITWEB_JS) $(GITWEB_CSS)
20 OTHER_PROGRAMS += gitweb/gitweb.cgi $(GITWEB_PROGRAMS)
21 gitweb/gitweb.cgi: gitweb/gitweb.perl $(GITWEB_PROGRAMS)
22 $(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) $(patsubst gitweb/%,%,$@)
23 @@ -1675,7 +1674,7 @@
24 endif # CSSMIN
25
26
27 -git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js
28 +git-instaweb: git-instaweb.sh gitweb/gitweb.cgi $(GITWEB_CSS) $(GITWEB_JS)
29 $(QUIET_GEN)$(RM) $@ $@+ && \
30 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
31 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \

  ViewVC Help
Powered by ViewVC 1.1.20