diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /doc | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/.gitignore | 3 | ||||
| -rw-r--r-- | doc/Makefile | 19 | ||||
| -rw-r--r-- | doc/version.texi | 1 |
3 files changed, 8 insertions, 15 deletions
diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 00000000..5f3dadac --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,3 @@ +/*.info +/*.info-* +/version.texi diff --git a/doc/Makefile b/doc/Makefile index 0c00976c..b64a8386 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 1994, 1998, 1999, 2003 Free Software Foundation +# Copyright (C) 1994, 1998, 1999, 2003, 2012 Free Software Foundation # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -18,10 +17,11 @@ dir := doc makemode := misc -DIST_FILES := navigating gpl.texinfo hurd.texi version.texi -targets = hurd.info $(wildcard hurd.info-*) +targets = hurd.info $(wildcard hurd.info-*) version.texi installationdir = $(infodir) +DISTFILES = $(targets) + DVIPS = dvips include ../Makeconf @@ -48,17 +48,8 @@ include ../Makeconf %.ps: %.dvi $(DVIPS) $< -o $@ -move-if-change = $(SHELL) $(top_srcdir)/move-if-change - version.texi: stamp-version; @: -stamp-version: $(top_srcdir)/Makeconf +stamp-version: $(..)config.make echo '@set VERSION $(hurd-version)' > version.texi.new $(move-if-change) version.texi.new version.texi touch $@ - -# XXX: the default lndist target will try to look for target files -# in the source directory. Special case them. -lndist: lndist-info-targets -lndist-info-targets: hurd.info $(wildcard hurd.info-*) - ln $? $(top_srcdir)/hurd-snap/$(dir) - diff --git a/doc/version.texi b/doc/version.texi deleted file mode 100644 index 5df65c28..00000000 --- a/doc/version.texi +++ /dev/null @@ -1 +0,0 @@ -@set VERSION 0.2 |