From 9fcbb2be4ebf6f310369b298604acbc44d05de1e Mon Sep 17 00:00:00 2001
From: Fabian Greffrath
Date: Tue, 22 Apr 2014 13:09:00 +0200
Subject: Follow up for "fix man/Makefile for forks"

---
 man/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/Makefile.am b/man/Makefile.am
index ccdc1958..68daf199 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -48,7 +48,7 @@ CLEANFILES = $(GENERATED_MAN_PAGES) $(SETUP_MAN_PAGES) \
              $(doomdocs_DATA) $(hereticdocs_DATA) \
              $(hexendocs_DATA) $(strifedocs_DATA)
 
-$(SETUP_MAN_PAGES): @PROGRAM_PREFIX@setup.6
+$(SETUP_MAN_PAGES): chocolate-setup.6
 	cp $< $@
 
 @PROGRAM_PREFIX@doom.6: ../src $(MANPAGE_GEN_FILES)
-- 
cgit v1.2.3


From 71936d184819b519c544e9e90ec820cabfb59765 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath
Date: Tue, 22 Apr 2014 19:05:46 +0200
Subject: Fix a segfault in i_sdlmusic.c

We are free()ing the const char* a few lines later.---
 src/i_sdlmusic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 2a714d3d..4f540e8d 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -319,7 +319,7 @@ static void LoadSubstituteConfigs(void)
 
     if (!strcmp(configdir, ""))
     {
-        musicdir = "";
+        musicdir = strdup("");
     }
     else
     {
-- 
cgit v1.2.3