diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-09-15 17:12:02 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-09-15 17:12:02 +0000 |
commit | 1443d1bff68feae73cbbaf8e522a20735b43c580 (patch) | |
tree | 2d0203e888a60a215b803076ddbe7c2f3ec876f8 /app/xinit/Makefile.am | |
parent | dd9a0a4cb85188d898894f8e4972ec8dabe030f6 (diff) |
merge xinit 1.0.6
Diffstat (limited to 'app/xinit/Makefile.am')
-rw-r--r-- | app/xinit/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/xinit/Makefile.am b/app/xinit/Makefile.am index 9e63cf8b6..a6ad04aa9 100644 --- a/app/xinit/Makefile.am +++ b/app/xinit/Makefile.am @@ -64,6 +64,7 @@ MANDEFS = \ -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \ -D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \ -D__xinitdir__=$(XINITDIR) \ + -D__bindir__=$(bindir) \ -DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS) SUFFIXES = .$(APP_MAN_SUFFIX) .man @@ -100,5 +101,9 @@ xinitrc_DATA = xinitrc CLEANFILES = xinitrc startx $(appman_DATA) EXTRA_DIST = xinitrc.cpp startx.cpp $(appman_PRE) \ - startx.cmd xinitrc.cmd xinit.def + startx.cmd xinitrc.cmd xinit.def ChangeLog autogen.sh +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog |