summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-03-15 08:27:54 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-03-15 08:27:54 (UTC)
commit290c2a752fe2b338e6fd67f873bd80ff7e4665a2 (patch) (side-by-side diff)
tree5961148b7ffb1eb369acc825fb7b2ab67db4e855
parent780d2d98598e621d12c7b23d4c68b5ddc7019838 (diff)
downloadcgit-290c2a752fe2b338e6fd67f873bd80ff7e4665a2.zip
cgit-290c2a752fe2b338e6fd67f873bd80ff7e4665a2.tar.gz
cgit-290c2a752fe2b338e6fd67f873bd80ff7e4665a2.tar.bz2
Fix doc-related glitches in Makefile and .gitignore
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--.gitignore5
-rw-r--r--Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1e016e5..487728b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
# Files I don't care to see in git-status/commit
cgit
cgit.conf
VERSION
+cgitrc.5
+cgitrc.5.fo
+cgitrc.5.html
+cgitrc.5.pdf
+cgitrc.5.xml
*.o
*.d
diff --git a/Makefile b/Makefile
index 056d516..9831bcf 100644
--- a/Makefile
+++ b/Makefile
@@ -120,52 +120,52 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
ifdef NO_ICONV
CFLAGS += -DNO_ICONV
endif
ifdef NO_STRCASESTR
CFLAGS += -DNO_STRCASESTR
endif
cgit: $(OBJECTS) libgit
$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
cgit.o: VERSION
-include $(OBJECTS:.o=.d)
libgit:
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
test: all
$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
install: all
$(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH)
$(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
$(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
$(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
$(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
uninstall:
rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
rm -f $(CGIT_DATA_PATH)/cgit.css
rm -f $(CGIT_DATA_PATH)/cgit.png
doc: man-doc html-doc pdf-doc
man-doc: cgitrc.5.txt
a2x -f manpage cgitrc.5.txt
html-doc: cgitrc.5.txt
a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
pdf-doc: cgitrc.5.txt
a2x -f pdf cgitrc.5.txt
clean: clean-doc
rm -f cgit VERSION *.o *.d
clean-doc:
- rm -f cgitrc.5 cgitrc.5.xhtml cgitrc.5.pdf
+ rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
get-git:
curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git