emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@Nexgo.DE>
To: emacs-orgmode@gnu.org
Subject: Re: Please test the new Makefile
Date: Thu, 22 Dec 2011 11:25:03 +0100	[thread overview]
Message-ID: <jcv0hm$39t$1@dough.gmane.org> (raw)
In-Reply-To: <87zkelyd7c.fsf@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 :-)

      parent reply	other threads:[~2011-12-22 10:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-21 18:47 Please test the new Makefile Bastien
2011-12-22  1:35 ` Takaaki ISHIKAWA
2011-12-22 10:05   ` Achim Gratz
2011-12-22 15:06     ` Takaaki ISHIKAWA
2011-12-23 16:10       ` Bastien
2011-12-25 10:27       ` ASSI
2011-12-26  4:58         ` Takaaki ISHIKAWA
2011-12-27 10:33           ` Achim Gratz
2012-01-02 21:50     ` Achim Gratz
2012-01-03 18:09       ` Achim Gratz
2012-01-04 17:46         ` Achim Gratz
2011-12-22 10:25 ` Achim Gratz [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='jcv0hm$39t$1@dough.gmane.org' \
    --to=stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).