Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 25B49431FB6 for ; Wed, 18 Apr 2012 06:11:07 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lj0AE7WL-Csf for ; Wed, 18 Apr 2012 06:11:06 -0700 (PDT) Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) by olra.theworths.org (Postfix) with ESMTP id 7EC32431FAE for ; Wed, 18 Apr 2012 06:11:06 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id 6786A68055; Wed, 18 Apr 2012 16:11:02 +0300 (EEST) From: Tomi Ollila To: Felipe Contreras , notmuch@notmuchmail.org Subject: Re: [PATCH] vim: simplify build In-Reply-To: <1334751115-7216-1-git-send-email-felipe.contreras@gmail.com> References: <1334751115-7216-1-git-send-email-felipe.contreras@gmail.com> User-Agent: Notmuch/0.12+113~gde05574 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-unknown-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2012 13:11:07 -0000 On Wed, Apr 18 2012, Felipe Contreras wrote: > There should be no functional changes, except that you don't need to > make the directories before installing. > > Signed-off-by: Felipe Contreras > --- Hmm, Where is $(PWD) make variable documented; I found only $(CURDIR) anyway, te following test makefile works OK. all: echo $(PWD) echo $(CURDIR) (i.e. both echo the current directory) If this is not an issue, then LGTM. Tomi > vim/Makefile | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/vim/Makefile b/vim/Makefile > index 89e18be..e7b7faa 100644 > --- a/vim/Makefile > +++ b/vim/Makefile > @@ -1,11 +1,11 @@ > .PHONY: all help install link symlink > > -FILES = plugin/notmuch.vim \ > - $(wildcard syntax/notmuch-*.vim) > +files = plugin/notmuch.vim \ > + $(wildcard syntax/notmuch-*.vim) > +prefix = $(HOME)/.vim > +destdir = $(prefix)/plugin > > -PREFIX = $(shell ls -d ~/.vim/) > - > -OUT_FILES = $(FILES:%=${PREFIX}/%) > +INSTALL = install -D -m644 > > all: help > > @@ -16,9 +16,8 @@ help: > @echo " make install - copy plugin scripts and syntax files to ~/.vim" > @echo " make symlink - create symlinks in ~/.vim (useful for development)" > > -install: ${OUT_FILES} > -link symlink: > - ${MAKE} SYMLINK=1 install > +install: > + @for x in $(files); do $(INSTALL) $(PWD)/$$x $(prefix)/$$x; done > > -${OUT_FILES}: ${PREFIX}/%: % > - $(if ${SYMLINK},ln -fs,cp) `pwd`/$< $@ > +link symlink: INSTALL = ln -fs > +link symlink: install > -- > 1.7.10 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch