From eca0d817b7973d678d31608870bea86a141442ab Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 10 Mar 2011 19:03:23 +0000
Subject: Replace the INSTALL file with a template version that is customized
 to different platforms.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2299
---
 Makefile.am | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index a766d348..310bb5f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,24 +33,31 @@ DATA_FILES=                   \
         data/setup.png        \
         data/convert-icon
 
+DOC_FILES=                              \
+        CMDLINE                         \
+        README                          \
+        README.OPL                      \
+        BUGS                            \
+        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 setup
 DIST_SUBDIRS=pkg $(SUBDIRS)
 
@@ -61,5 +68,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
 
-- 
cgit v1.2.3


From 0268c882d96942175f1c6028c636dddce8af593f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 28 Mar 2011 23:48:31 +0000
Subject: Remove the BUGS file as it doesn't really contain any useful
 information.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2316
---
 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 310bb5f6..56c82fe8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,6 @@ DOC_FILES=                              \
         CMDLINE                         \
         README                          \
         README.OPL                      \
-        BUGS                            \
         NEWS                            \
         ChangeLog                       \
         NOT-BUGS
-- 
cgit v1.2.3


From d07b88e469abbb7c82d10fbe17473d529aaa4388 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 14 May 2011 21:07:55 +0000
Subject: Add freedesktop.org desktop files for chocolate-doom, chocolate-setup
 (thanks Adrián Chaves Fernández).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2337
---
 Makefile.am | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 56c82fe8..d766ab61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,16 +23,6 @@ CODEBLOCKS_FILES=                              \
 	codeblocks/setup-res.rc                \
 	codeblocks/textscreen.cbp
 
-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                          \
@@ -45,7 +35,6 @@ EXTRA_DIST=                             \
         $(AUX_DIST_GEN)                 \
         $(MSVC_FILES)                   \
         $(CODEBLOCKS_FILES)             \
-        $(DATA_FILES)                   \
         $(DOC_FILES)                    \
         .lvimrc                         \
         HACKING                         \
@@ -57,7 +46,7 @@ doc_DATA=$(DOC_FILES)
 
 MAINTAINERCLEANFILES =  $(AUX_DIST_GEN)
 
-SUBDIRS=wince textscreen opl pcsound src man setup
+SUBDIRS=wince textscreen opl pcsound data src man setup
 DIST_SUBDIRS=pkg $(SUBDIRS)
 
 if HAVE_PYTHON
-- 
cgit v1.2.3