chiark / gitweb /
Merge commit 'refs/top-bases/debian/locations' into debian/locations
authormartin f. krafft <madduck@debian.org>
Mon, 17 Nov 2008 21:55:07 +0000 (22:55 +0100)
committermartin f. krafft <madduck@debian.org>
Mon, 17 Nov 2008 21:55:07 +0000 (22:55 +0100)
Conflicts:
Makefile

1  2 
Makefile
tg.sh

diff --cc 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)
  
diff --cc tg.sh
Simple merge