summaryrefslogtreecommitdiffabout
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) (side-by-side diff)
tree0a5118a4ddb5d32aa0b70326d1868033870c34ac
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 (more/less context) (show 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
@@ -18,35 +18,35 @@ OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
ui-snapshot.o ui-blob.o ui-tag.o
.PHONY: all git install clean distclean force-version get-git
all: cgit git
VERSION: force-version
@./gen-version.sh "$(CGIT_VERSION)"
-include VERSION
CFLAGS += -g -Wall -Igit
CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
-CFLAGS += -DCGIT_CONFIG='"$(DESTDIR)$(CGIT_CONFIG)"'
+CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
-CFLAGS += -DCGIT_CACHE_ROOT='"$(DESTDIR)$(CACHE_ROOT)"'
+CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
cgit: cgit.c $(OBJECTS)
$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
git/xdiff/lib.a: | git
git/libgit.a: | git
git:
cd git && $(MAKE) xdiff/lib.a
cd git && $(MAKE) libgit.a
install: all