- updated for 1.4.0

Changed files:
    dosemu-make-new.patch -> 1.11
    dosemu-man-pages.patch -> 1.14

diff --git a/dosemu-make-new.patch b/dosemu-make-new.patch
index 0c8bab715f545e63c14d61eb6d3d570c013872a7..42fe1d772046f9d386ca896969561e0ece1bcbe3 100644 (file)
--- a/dosemu-make-new.patch
+++ b/dosemu-make-new.patch
@@ -13,8 +13,8 @@ diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac
                # because in forces _inline_ at places where we don't want it !
                # If we want _inline_, well then we 'code' it.
      OPT="$OPT -fomit-frame-pointer"  # never omit the frame pointer when debugging!
-@@ -517,38 +517,6 @@
-  fi
+@@ -517,37 +517,6 @@
+   fi
  
  
 -  # -m486 is usually in the specs for the compiler
@@ -25,10 +25,9 @@ diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac
 -  if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ;  then
 -    target_cpu="i686"
 -  fi
--  if test "$target_cpu" = "x86_64"; then
--    target_cpu="k8"
--  fi
--  if test "$GCC_VERSION_CODE" -ge 3004 ; then
+-  if test -z "$target_cpu" ; then
+-     true
+-  elif test "$GCC_VERSION_CODE" -ge 3004 ; then
 -     OPT="$OPT -mtune=$target_cpu"
 -  elif test "$GCC_VERSION_CODE" -ge 2095 ; then
 -     OPT="$OPT -mcpu=$target_cpu"
@@ -51,4 +50,4 @@ diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac
 -  fi
  
    AC_MSG_CHECKING(for glibc...)
-   set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|gcc -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
+   set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2 " " $4}'`

diff --git a/dosemu-man-pages.patch b/dosemu-man-pages.patch
index 3d6b87180a5494a3a5277b89513b51c78be6944f..40a2393c5888daba89e2a86c280258d63c424d1e 100644 (file)
--- a/dosemu-man-pages.patch
+++ b/dosemu-man-pages.patch
@@ -144,24 +144,6 @@
  .I --Fusers
  Bypass dosemu.users and take this file instead (only accepted when
 -.B dosemu.bin
-+.B dosemu
- is
- .I not
- suid-root).
-@@ -172,7 +171,7 @@
- .I --Flibdir
- Bypass the default DOSEMU_LIB_DIR (as maybe defined in dosemu.users)
- and use this directory instead (only accepted when
--.B dosemu.bin
-+.B dosemu
- is
- .I not
- suid-root).
-@@ -180,7 +179,7 @@
- .I --Fimagedir
- Bypass the default directory for bootdirectory and hdimages (DOSEMU_HDIMAGE_DIR)
- and use this directory instead (only accepted when
--.B dosemu.bin
 +.B dosemu
  is
  .I not