- fixed mfs.c with ptsdos

[packages/dosemu.git] / dosemu-make-new.patch

diff --git a/dosemu-make-new.patch b/dosemu-make-new.patch
index 4a84c4579262d7d5212701d51fa9640a9b59ebf5..da33a10d2c2378ad4c5cf77a923301563b731aa8 100644 (file)
--- a/dosemu-make-new.patch
+++ b/dosemu-make-new.patch
@@ -1,22 +1,13 @@
-diff -ur dosemu-1.0.1.orig/base-configure dosemu-1.0.1/base-configure
---- dosemu-1.0.1.orig/base-configure   Sun Jun 18 16:34:26 2000
-+++ dosemu-1.0.1/base-configure        Thu Aug 17 09:56:30 2000
-@@ -72,7 +72,7 @@
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- infodir='${prefix}/info'
--mandir='${prefix}/man'
-+mandir='${prefix}/share/man'
- 
- # Initialize some other variables.
- subdirs=
+diff -ur dosemu-1.0.2.orig/base-configure.in dosemu-1.0.2/base-configure.in
+--- dosemu-1.0.2.orig/base-configure.in        Sun Jun 18 16:34:26 2000
++++ dosemu-1.0.2/base-configure.in     Thu Aug 17 09:56:30 2000
 @@ -3855,19 +3855,8 @@
    OPT="$OPT -fomit-frame-pointer"  # never omit the frame pointer when debugging!
  fi
  
 -# -m486 is usually in the specs for the compiler
 -case "$host_cpu" in
--  i[456]86)
+-  i[[456]]86)
 -    OPT="$OPT -m486 -malign-loops=2 -malign-jumps=2 -malign-functions=2"
 -    ;;
 -  i386)
@@ -27,11 +18,10 @@ diff -ur dosemu-1.0.1.orig/base-configure dosemu-1.0.1/base-configure
 -esac
  
 -OPT="$OPT -MD" # this should give painless dependencies
-+OPT="$RPM_OPT_FLAGS -MD" # this should give painless dependencies
++OPT="$OPTFLAGS -MD" # this should give painless dependencies
  
  # OPT=-fno-inline
  if test "$CONFIG_HOST" = "linux"; then
-Only in dosemu-1.0.1: base-configure~
 diff -ur dosemu-1.0.1.orig/man/Makefile dosemu-1.0.1/man/Makefile
 --- dosemu-1.0.1.orig/man/Makefile     Sun Mar  5 13:57:36 2000
 +++ dosemu-1.0.1/man/Makefile  Thu Aug 17 09:57:21 2000
@@ -43,20 +33,18 @@ diff -ur dosemu-1.0.1.orig/man/Makefile dosemu-1.0.1/man/Makefile
 +      install *dos*.1 mkfatimage*.1 $(INSTROOT)/usr/share/man/man1
  
  clean realclean:
-Only in dosemu-1.0.1/man: Makefile~
-diff -ur dosemu-1.0.1.orig/src/arch/linux/Makefile.main dosemu-1.0.1/src/arch/linux/Makefile.main
---- dosemu-1.0.1.orig/src/arch/linux/Makefile.main     Tue Mar 28 01:22:01 2000
-+++ dosemu-1.0.1/src/arch/linux/Makefile.main  Thu Aug 17 10:02:53 2000
+diff -ur dosemu-1.0.2.orig/src/arch/linux/Makefile.main dosemu-1.0.2/src/arch/linux/Makefile.main
+--- dosemu-1.0.2.orig/src/arch/linux/Makefile.main     Tue Mar 28 01:22:01 2000
++++ dosemu-1.0.2/src/arch/linux/Makefile.main  Thu Aug 17 10:02:53 2000
 @@ -324,9 +324,9 @@
          install -m 0744 ../etc/keymap/* $(INSTROOT)/var/lib/dosemu/keymap; \
        fi
        @if [ -f $(INSTROOT)/lib/libemu ]; then rm -f $(INSTROOT)/lib/libemu ; fi
--      @install -c -o root -m 04755 $(BINPATH)/bin/dos $(INSTROOT)/usr/bin
-+      @install -c $(BINPATH)/bin/dos $(INSTROOT)/usr/bin
+-      @install -c -o root -m 0755 $(BINPATH)/bin/$(DOSBIN) $(INSTROOT)/usr/bin
++      @install -c $(BINPATH)/bin/$(DOSBIN) $(INSTROOT)/usr/bin
  ifdef  USE_MHPDBG
 -      @install -c -o root -m 0755 $(BINPATH)/bin/dosdebug $(INSTROOT)/usr/bin
 +      @install -c $(BINPATH)/bin/dosdebug $(INSTROOT)/usr/bin
  endif
  ifndef ELF
        @install -m 0644 $(LIBDOSEMU) $(INSTROOT)/usr/lib/libdosemu-$(THISVERSION)
-Only in dosemu-1.0.1/src/arch/linux: Makefile.main~