Skip to content

Commit 06b6697

Browse files
committed
infra
1 parent aa933c2 commit 06b6697

File tree

8 files changed

+21
-128
lines changed

8 files changed

+21
-128
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.*.swp
2+
*~
23
/man1
34
/crypt
45
/tst

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "git"]
2+
path = git
3+
url = ../../git/git.git
4+
ignore = untracked

Makefile

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@ man:
2424
testman:
2525
endif
2626

27-
man1/%.1: man1/%.xml manpage-normal.xsl manpage-bold-literal.xsl
28-
cd man1 && xmlto $(patsubst %,-m ../%,$(wordlist 2, 3, $^)) man ../$<
29-
30-
man1/%.xml: %.adoc asciidoc.conf
27+
man1/%.1: git/Documentation/%.1
3128
mkdir -p man1
32-
asciidoc -f $(word 2, $^) -b docbook -d manpage -o $@ $<
29+
cp $< $@
30+
31+
git/Documentation/%.1: git/Documentation/%.adoc git/config.mak
32+
$(MAKE) -C $(@D) DEVELOPER:=1 $(@F)
33+
34+
git/Documentation/%.adoc: %.adoc
35+
cp $< $@
36+
37+
git/config.mak: config.mak
38+
cp $< $@
3339

3440
test: testman
3541
rm -rf crypt tst
@@ -65,4 +71,6 @@ install: man
6571
install -D -m 644 -t $(DESTDIR)$(MANDIR)/man1 man1/git-incrypt.1
6672

6773
clean:
68-
rm -rf man1 crypt tst
74+
$(MAKE) -C git clean
75+
rm -rf man1 crypt tst \
76+
git/config.mak git/*incrypt* git/Documentation/*incrypt*

asciidoc.conf

Lines changed: 0 additions & 92 deletions
This file was deleted.

config.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MAN1_TXT += git-incrypt.adoc

git

Submodule git added at a2955b3

manpage-bold-literal.xsl

Lines changed: 0 additions & 16 deletions
This file was deleted.

manpage-normal.xsl

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)