- wrong merge of patches?

Changed files:
    doomlegacy-Makefile.patch -> 1.7

diff --git a/doomlegacy-Makefile.patch b/doomlegacy-Makefile.patch
index ba37e88d28cd825f4b56715627d3954d86823d99..3d2cfccdb7d8fdd25e4e3462a6484c7bcc851a67 100644 (file)
--- a/doomlegacy-Makefile.patch
+++ b/doomlegacy-Makefile.patch
@@ -1,5 +1,5 @@
---- doomlegacy_142_src/linux_x/musserv/Makefile.linux.orig     Sat Feb 22 21:12:31 2003
-+++ doomlegacy_142_src/linux_x/musserv/Makefile.linux  Sat Feb 22 21:12:52 2003
+--- doomlegacy-1.42/doomlegacy_142_src/linux_x/musserv/Makefile.linux.orig     Sat Feb 22 21:12:31 2003
++++ doomlegacy-1.42/doomlegacy_142_src/linux_x/musserv/Makefile.linux  Sat Feb 22 21:12:52 2003
 @@ -3,7 +3,7 @@
  #
  
@@ -9,8 +9,8 @@
  LDFLAGS       =
  #LDFLAGS      = -static
  
---- doomlegacy_142_src/linux_x/sndserv/Makefile.orig   Sat Feb 22 21:11:50 2003
-+++ doomlegacy_142_src/linux_x/sndserv/Makefile        Sat Feb 22 21:12:12 2003
+--- doomlegacy-1.42/doomlegacy_142_src/linux_x/sndserv/Makefile.orig   Sat Feb 22 21:11:50 2003
++++ doomlegacy-1.42/doomlegacy_142_src/linux_x/sndserv/Makefile        Sat Feb 22 21:12:12 2003
 @@ -22,7 +22,7 @@
  #
  
@@ -20,8 +20,8 @@
  ifdef FREEBSD
  CFLAGS:=${CFLAGS} -DFREEBSD
  endif
---- doomlegacy_142_src/tools/makefile.orig     Sat Feb 22 21:13:11 2003
-+++ doomlegacy_142_src/tools/makefile  Sat Feb 22 21:14:30 2003
+--- doomlegacy-1.42/doomlegacy_142_src/tools/makefile.orig     Sat Feb 22 21:13:11 2003
++++ doomlegacy-1.42/doomlegacy_142_src/tools/makefile  Sat Feb 22 21:14:30 2003
 @@ -1,24 +1,24 @@
  
  default:    dircomp2.c