diff options
| author | Simon Howard | 2011-09-11 23:40:44 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-09-11 23:40:44 +0000 |
| commit | efd15d965dee947a04727bb62f4e2092cf28732f (patch) | |
| tree | 730d99c1e88d5e3145e552ad69dec52d30026d01 /Makefile.am | |
| parent | 4d17ab361e90a75dc6deefd37e6eb2ba0610b386 (diff) | |
| parent | 11024d8214580d63ca7a9e70a121f5ff542a2fce (diff) | |
| download | chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.gz chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.bz2 chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.zip | |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2367
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 09fc5868..46c9dec8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,36 +31,32 @@ CODEBLOCKS_FILES= \ codeblocks/setup.cbp \ codeblocks/setup-res.rc -DATA_FILES= \ - data/README \ - data/doom.ico \ - data/doom8.ico \ - data/doom.png \ - data/setup.ico \ - data/setup8.ico \ - data/setup.png \ - data/convert-icon +DOC_FILES= \ + CMDLINE \ + README \ + README.OPL \ + NEWS \ + ChangeLog \ + NOT-BUGS EXTRA_DIST= \ $(AUX_DIST_GEN) \ $(MSVC_FILES) \ $(CODEBLOCKS_FILES) \ - $(DATA_FILES) \ + $(DOC_FILES) \ .lvimrc \ - config.h \ - CMDLINE \ HACKING \ - README.OPL \ TODO \ - BUGS \ - NOT-BUGS \ rpm.spec +docdir=$(prefix)/share/doc/@PACKAGE@ +doc_DATA=$(DOC_FILES) + MAINTAINERCLEANFILES = $(AUX_DIST_GEN) docdir=$(prefix)/share/doc/@PACKAGE@ -SUBDIRS=wince textscreen opl pcsound src man +SUBDIRS=wince textscreen opl pcsound data src man DIST_SUBDIRS=pkg $(SUBDIRS) @@ -71,5 +67,8 @@ noinst_DATA=CMDLINE CMDLINE : src/ ./man/docgen -p man/CMDLINE.template src/ > $@ +INSTALL : man/INSTALL.template man/simplecpp + ./man/simplecpp < man/INSTALL.template > $@ + endif |