Add externs to avoid multiple definitions, and then add missing definitions.

[rrq/maintain_lilo.git] / debian / patches / 01_makefile-adds.patch

diff --git a/debian/patches/01_makefile-adds.patch b/debian/patches/01_makefile-adds.patch
index eb455769c540e024935e4934b008ede63e58183d..84164a7bab07455fbd47cb0e700c415e9d5778eb 100644 (file)
--- a/debian/patches/01_makefile-adds.patch
+++ b/debian/patches/01_makefile-adds.patch
@@ -1,15 +1,15 @@
 Package:     lilo
 Subject:     add autoauto and diag1.img to makefile
-Author:      Joachim Wiedorn <ad_debian at joonet.de>
+Author:      Joachim Wiedorn <joodebian at joonet.de>
 Forwarded:   no
-Last-Update: 2010-11-11
+Last-Update: 2011-05-06
 
 ---
 
 diff -urN s00/make.vars s01/make.vars
---- s00/make.vars      2010-06-28 22:47:31.000000000 +0200
-+++ s01/make.vars      2010-11-04 23:15:56.367070520 +0100
-@@ -65,7 +65,7 @@
+--- s00/make.vars      2011-04-09 16:59:26.000000000 +0200
++++ s01/make.vars      2011-05-06 17:25:55.864706382 +0200
+@@ -71,7 +71,7 @@
  
  CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
      -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
@@ -19,9 +19,9 @@ diff -urN s00/make.vars s01/make.vars
  # set the following if you wish LILO.COM to be installed
  DOS_DIR=/dosC/boot
 diff -urN s00/src/Makefile s01/src/Makefile
---- s00/src/Makefile   2010-11-04 16:35:52.000000000 +0100
-+++ s01/src/Makefile   2010-11-04 23:15:50.831064767 +0100
-@@ -41,7 +41,7 @@
+--- s00/src/Makefile   2011-04-09 16:59:26.000000000 +0200
++++ s01/src/Makefile   2011-05-06 17:25:55.882961287 +0200
+@@ -47,7 +47,7 @@
  #
  # everything needed to run, just short of installation
  #