From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Gernhardt Subject: [PATCH v3 3/3] INSTALL: Describe dependency knobs from Makefile Date: Thu, 10 Sep 2009 16:28:19 -0400 Message-ID: <1252614499-13681-1-git-send-email-brian@gernhardtsoftware.com> References: <7v7hw6aas8.fsf@alter.siamese.dyndns.org> Cc: Junio C Hamano To: Git List X-From: git-owner@vger.kernel.org Thu Sep 10 22:28:35 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MlqFu-0002s7-QM for gcvg-git-2@lo.gmane.org; Thu, 10 Sep 2009 22:28:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282AbZIJU2U (ORCPT ); Thu, 10 Sep 2009 16:28:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753111AbZIJU2T (ORCPT ); Thu, 10 Sep 2009 16:28:19 -0400 Received: from vs072.rosehosting.com ([216.114.78.72]:36964 "EHLO silverinsanity.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753062AbZIJU2T (ORCPT ); Thu, 10 Sep 2009 16:28:19 -0400 Received: by silverinsanity.com (Postfix, from userid 5001) id 6F9311FFC087; Thu, 10 Sep 2009 20:28:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on silverinsanity.com X-Spam-Level: X-Spam-Status: No, score=-4.5 required=4.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from localhost.localdomain (cpe-67-240-168-84.rochester.res.rr.com [67.240.168.84]) by silverinsanity.com (Postfix) with ESMTPA id E1B301FFC06B; Thu, 10 Sep 2009 20:28:13 +0000 (UTC) X-Mailer: git-send-email 1.6.4.2.420.g30ecf In-Reply-To: <7v7hw6aas8.fsf@alter.siamese.dyndns.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We said that some of our dependencies were optional, but didn't say how to turn them off. Add information for that and mention where to save the options close to the top of the file. Also, standardize on both using quotes for the names of the dependencies and tabs for indentation of the list. Signed-off-by: Brian Gernhardt --- INSTALL | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) Junio C Hamano wrote: > Sorry, but the description still speaks of options and does not say what > good they are. Sent a wrong patch? Wrong patch? Never. A good git developer always makes sure he re-generated patch files before making a fool of himself on a public list. Ahem. diff --git a/INSTALL b/INSTALL index 7ab2580..be504c9 100644 --- a/INSTALL +++ b/INSTALL @@ -13,6 +13,10 @@ that uses $prefix, the built results have some paths encoded, which are derived from $prefix, so "make all; make prefix=/usr install" would not work. +The beginning of the Makefile documents many variables that affect the way +git is built. You can override them either from the command line, or in a +config.mak file. + Alternatively you can use autoconf generated ./configure script to set up install paths (via config.mak.autogen), so you can write instead @@ -48,7 +52,9 @@ Issues of note: export GIT_EXEC_PATH PATH GITPERLLIB - Git is reasonably self-sufficient, but does depend on a few external - programs and libraries: + programs and libraries. Git can be used without most of them by adding + the approriate "NO_=YesPlease" to the make command line or + config.mak file. - "zlib", the compression library. Git won't build without it. @@ -59,25 +65,29 @@ Issues of note: - "Perl" is needed to use some of the features (e.g. preparing a partial commit using "git add -i/-p", interacting with svn - repositories with "git svn"). + repositories with "git svn"). If you can live without these, use + NO_PERL. - - "openssl". Unless you specify otherwise, you'll get the SHA1 - library from here. + - "openssl" library is used by git-imap-send to use IMAP over SSL. + If you don't need it, use NO_OPENSSL. - If you don't have openssl, you can use one of the SHA1 libraries - that come with git (git includes one inspired by Mozilla's and a - PowerPC optimized one too - see the Makefile). + By default, git uses OpenSSL for SHA1 but it will use it's own + library (inspired by Mozilla's) with either NO_OPENSSL or + BLK_SHA1. Also included is a version optimized for PowerPC + (PPC_SHA1). - - libcurl library; git-http-fetch and git-fetch use them. You + - "libcurl" library is used by git-http-fetch and git-fetch. You might also want the "curl" executable for debugging purposes. - If you do not use http transfer, you are probably OK if you - do not have them. + If you do not use http:// or https:// repositories, you do not + have to have them (use NO_CURL). - - expat library; git-http-push uses it for remote lock - management over DAV. Similar to "curl" above, this is optional. + - "expat" library; git-http-push uses it for remote lock + management over DAV. Similar to "curl" above, this is optional + (with NO_EXPAT). - - "wish", the Tcl/Tk windowing shell is used in gitk to show the - history graphically, and in git-gui. + - "wish", the Tcl/Tk windowing shell is used in gitk to show the + history graphically, and in git-gui. If you don't want gitk or + git-gui, you can use NO_TCLTK. - Some platform specific issues are dealt with Makefile rules, but depending on your specific installation, you may not -- 1.6.4.2.420.g30ecf