From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 06:21:27 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b43688a5bc2eaa8a5805856fc11dc3cd60e6e6ac;p=git.git

Merge branch 'maint'

* maint:
  gitweb/Makefile: fix typo in gitweb.min.css rule

Conflicts:
	gitweb/Makefile
---

b43688a5bc2eaa8a5805856fc11dc3cd60e6e6ac
diff --cc gitweb/Makefile
index d2584fedd,e7dd25277..2fb7c2d77
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@@ -99,17 -88,12 +99,17 @@@ GITWEB_FILES += static/gitweb.j
  endif
  
  ifdef CSSMIN
 -GITWEB_CSS = gitweb.min.css
 -all:: gitweb.min.css
 -gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS
 +GITWEB_FILES += static/gitweb.min.css
 +GITWEB_CSS = static/gitweb.min.css
 +all:: static/gitweb.min.css
 +static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS
- 	$(QUIET_GEN)$(CSSMIN) <$ >$@
+ 	$(QUIET_GEN)$(CSSMIN) <$< >$@
 +else
 +GITWEB_FILES += static/gitweb.css
  endif
  
 +GITWEB_FILES += static/git-logo.png static/git-favicon.png
 +
  GITWEB_REPLACE = \
  	-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
  	-e 's|++GIT_BINDIR++|$(bindir)|g' \