author | Lars Hjemli <hjemli@gmail.com> | 2007-09-08 16:38:10 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-08 16:38:10 (UTC) |
commit | 152c5e2aca6bf3f07af6b19beec872e8b3b43d1d (patch) (unidiff) | |
tree | 0a5118a4ddb5d32aa0b70326d1868033870c34ac | |
parent | af38d6565fdf47f723899ecbd22686ebbefd5bbb (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -18,35 +18,35 @@ OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | |||
18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ | 18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ |
19 | ui-snapshot.o ui-blob.o ui-tag.o | 19 | ui-snapshot.o ui-blob.o ui-tag.o |
20 | 20 | ||
21 | 21 | ||
22 | .PHONY: all git install clean distclean force-version get-git | 22 | .PHONY: all git install clean distclean force-version get-git |
23 | 23 | ||
24 | all: cgit git | 24 | all: cgit git |
25 | 25 | ||
26 | VERSION: force-version | 26 | VERSION: force-version |
27 | @./gen-version.sh "$(CGIT_VERSION)" | 27 | @./gen-version.sh "$(CGIT_VERSION)" |
28 | -include VERSION | 28 | -include VERSION |
29 | 29 | ||
30 | 30 | ||
31 | CFLAGS += -g -Wall -Igit | 31 | CFLAGS += -g -Wall -Igit |
32 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 32 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
33 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 33 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
34 | CFLAGS += -DCGIT_CONFIG='"$(DESTDIR)$(CGIT_CONFIG)"' | 34 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
35 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 35 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
36 | CFLAGS += -DCGIT_CACHE_ROOT='"$(DESTDIR)$(CACHE_ROOT)"' | 36 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
37 | 37 | ||
38 | 38 | ||
39 | cgit: cgit.c $(OBJECTS) | 39 | cgit: 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 | ||
44 | git/xdiff/lib.a: | git | 44 | git/xdiff/lib.a: | git |
45 | 45 | ||
46 | git/libgit.a: | git | 46 | git/libgit.a: | git |
47 | 47 | ||
48 | git: | 48 | git: |
49 | cd git && $(MAKE) xdiff/lib.a | 49 | cd git && $(MAKE) xdiff/lib.a |
50 | cd git && $(MAKE) libgit.a | 50 | cd git && $(MAKE) libgit.a |
51 | 51 | ||
52 | install: all | 52 | install: all |