From: martin f. krafft <madduck@debian.org>
Date: Mon, 17 Nov 2008 21:55:07 +0000 (+0100)
Subject: Merge commit 'refs/top-bases/debian/locations' into debian/locations
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=ed5f8376b25da3793b40ce660f3ab8eca9f0cb7f;p=topgit.git

Merge commit 'refs/top-bases/debian/locations' into debian/locations

Conflicts:
	Makefile
---

ed5f8376b25da3793b40ce660f3ab8eca9f0cb7f
diff --cc Makefile
index 835811e,3ce39a5..31cc98e
--- a/Makefile
+++ b/Makefile
@@@ -1,16 -1,16 +1,16 @@@
- prefix = $(HOME)
- bindir = $(prefix)/bin
- cmddir = $(prefix)/share/topgit
- docdir = $(prefix)/share/doc/topgit
- hooksdir = $(cmddir)/hooks
+ prefix ?= $(HOME)
+ bindir := $(prefix)/bin
 -cmddir := $(prefix)/libexec/topgit
 -sharedir := $(prefix)/share/topgit
++cmddir := $(prefix)/share/topgit
++docdir := $(prefix)/share/doc/topgit
+ hooksdir := $(cmddir)/hooks
  
  
- commands_in = $(wildcard tg-*.sh)
+ commands_in := $(wildcard tg-*.sh)
  hooks_in = hooks/pre-commit.sh
  
- commands_out = $(patsubst %.sh,%,$(commands_in))
- hooks_out = $(patsubst %.sh,%,$(hooks_in))
- help_out = $(patsubst %.sh,%.txt,$(commands_in))
+ commands_out := $(patsubst %.sh,%,$(commands_in))
+ hooks_out := $(patsubst %.sh,%,$(hooks_in))
+ help_out := $(patsubst %.sh,%.txt,$(commands_in))
  
  all::	tg $(commands_out) $(hooks_out) $(help_out)