shithub: choc

Info  •  Files  •  Log  •  Branches

Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

--- a/man/Makefile.am

+++ b/man/Makefile.am

@@ -48,7 +48,7 @@

              $(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)

--- a/src/i_sdlmusic.c

+++ b/src/i_sdlmusic.c

@@ -319,7 +319,7 @@

     if (!strcmp(configdir, ""))

     {

-        musicdir = "";

+        musicdir = strdup("");

     }

     else

     {