summaryrefslogtreecommitdiffabout
path: root/Makefile
authorLars Hjemli <hjemli@gmail.com>2007-09-08 16:38:10 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-09-08 16:38:10 (UTC)
commit152c5e2aca6bf3f07af6b19beec872e8b3b43d1d (patch) (unidiff)
tree0a5118a4ddb5d32aa0b70326d1868033870c34ac /Makefile
parentaf38d6565fdf47f723899ecbd22686ebbefd5bbb (diff)
downloadcgit-152c5e2aca6bf3f07af6b19beec872e8b3b43d1d.zip
cgit-152c5e2aca6bf3f07af6b19beec872e8b3b43d1d.tar.gz
cgit-152c5e2aca6bf3f07af6b19beec872e8b3b43d1d.tar.bz2
Revert "Makefile: add missing references to DESTDIR"
This reverts commit fa31c5ed4839575c3ef3f6f0823fc2b4af47dbfd, as I totally misunderstood the purpose of DESTDIR. Noticed-by: Chris Pickel <sfiera@macports.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'Makefile') (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ce3015d..3c0dd5f 100644
--- a/Makefile
+++ b/Makefile
@@ -26,19 +26,19 @@ all: cgit git
26VERSION: force-version 26VERSION: force-version
27 @./gen-version.sh "$(CGIT_VERSION)" 27 @./gen-version.sh "$(CGIT_VERSION)"
28-include VERSION 28-include VERSION
29 29
30 30
31CFLAGS += -g -Wall -Igit 31CFLAGS += -g -Wall -Igit
32CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 32CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
33CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 33CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
34CFLAGS += -DCGIT_CONFIG='"$(DESTDIR)$(CGIT_CONFIG)"' 34CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
35CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 35CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
36CFLAGS += -DCGIT_CACHE_ROOT='"$(DESTDIR)$(CACHE_ROOT)"' 36CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
37 37
38 38
39cgit: cgit.c $(OBJECTS) 39cgit: cgit.c $(OBJECTS)
40 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 40 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
41 41
42$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION 42$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
43 43
44git/xdiff/lib.a: | git 44git/xdiff/lib.a: | git