From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Please test the new Makefile Date: Thu, 22 Dec 2011 11:25:03 +0100 Message-ID: References: <87zkelyd7c.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:60107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rdfpu-0000kQ-Si for emacs-orgmode@gnu.org; Thu, 22 Dec 2011 05:25:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rdfpm-0006Ip-Vy for emacs-orgmode@gnu.org; Thu, 22 Dec 2011 05:25:18 -0500 Received: from lo.gmane.org ([80.91.229.12]:55983) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rdfpm-0006I9-NB for emacs-orgmode@gnu.org; Thu, 22 Dec 2011 05:25:10 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Rdfpl-0005lR-K0 for emacs-orgmode@gnu.org; Thu, 22 Dec 2011 11:25:09 +0100 Received: from p4fcf7994.dip.t-dialin.net ([79.207.121.148]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 22 Dec 2011 11:25:09 +0100 Received: from Stromeko by p4fcf7994.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 22 Dec 2011 11:25:09 +0100 In-Reply-To: <87zkelyd7c.fsf@gnu.org> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Am 21.12.2011 19:47, schrieb Bastien: > Things are fine here, you should be safe. The purpose of > the test is to make sure `make&& make install' do the right > thing in various setups. Actually, that should be make all && make install or (under Unixoid system and running as a normal user): make all && sudo make install Before doing a "make install", please check "default.mk" for where it tries to put things. You can override this by creating a file "local.mk" which just has definitions for those variables that you want to change (most of the time, just "prefix"). The installation is put into its own sub-directory "org" by default, if you've had a previous installation "flat" in site-lisp, you either need to remove those files or also install "flat" again - otherwise you will very likely pick up stale files from the previous installation. If you are brave, there is a non-documented target "clean-install" that will remove those files, but you should make doubly sure that lispdir and infodir point at the right place (run "make -n clean-install" and check which files make would remove if you ran it without "-n"). > git remote add -t Makefile remote-tableheadings git://repo.or.cz/org-mode/org-tableheadings.git > git fetch remote-tableheadings Makefile:local-Makefile > git checkout local-Makefile It is currently easier to test this from Git, since the makefile actually assumes a Git directory to be able to get at the version strings. If you get bitten by this, please change the following lines in default.mk: GITVERSION = $(shell git describe --abbrev=6 HEAD) ORGVERSION = $(subst release_,,$(shell git describe --abbrev=0 HEAD)) GITSTATUS = $(shell git status -uno --porcelain) to GITVERSION = "release_7.8.03-Makefile ORGVERSION = "7.8.03" GITSTATUS = "" I'm currently not able to rebase the branch on repo.or.cz, but you can do this yourself if you have your own local branch and also mirror the normal orgmode.git: git remote update git rebase local-Makefile origin/master (Hope I got this right, I'm currently not able to test it myself :-) -- Achim. (on the road :-)