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

--- dosemu-1.1.4/base-configure.in.orig	Wed Dec 18 02:36:44 2002
+++ dosemu-1.1.4/base-configure.in	Sat Jan 25 23:00:39 2003
@@ -532,14 +532,13 @@
 AC_SUBST(INCDIR)
 
 if test "$dodebug" = "yes"; then
-  COPTFLAGS=" -g -Wall -D_DEBUG"
-  OPT="-O"
+  COPTFLAGS=" -Wall -D_DEBUG"
+  OPT="$OPTFLAGS"
 else
   COPTFLAGS=" -Wall"
-  OPT="-O2"   # BIG NOTE: do _not_ use -O3,
+  OPT="$OPTFLAGS"   # BIG NOTE: do _not_ use -O3,
               # 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!
 fi
 
 dnl CPU emulator
@@ -625,32 +624,6 @@
   fi
 
 
-  # -m486 is usually in the specs for the compiler
-  # but gcc-3.0 wants -mcpu=i486 instead
-  # let the compiler options be dependent of the _target_
-  # where dosemu is compiled for, not the host
-  if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ;  then
-    target_cpu="i686"
-  fi
-  if test "$GCC_VERSION_CODE" -ge 2095 ; then
-     OPT="$OPT -mcpu=$target_cpu"
-  else
-     case "$target_cpu" in
-       i486)
-         OPT="$OPT -m486"
-         ;;
-       i386)
-         OPT="$OPT -m386"
-         ;;
-       *)
-         ;;
-     esac
-  fi
-  if test "$target_cpu" = "athlon"; then
-     OPT="$OPT -malign-functions=4 -fexpensive-optimizations"
-  elif test "$target_cpu" = "i486"; then
-     OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-  fi
   GCC_VERSION_CODE="-DGCC_VERSION_CODE=$GCC_VERSION_CODE"
 
   echo -n "checking for glibc..."
--- 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
@@ -7,6 +7,6 @@
 
 install:
 	@install -d $(INSTROOT)/usr/man/man1; \
-	install *dos*.1 mkfatimage*.1 $(INSTROOT)/usr/man/man1
+	install *dos*.1 mkfatimage*.1 $(INSTROOT)/usr/share/man/man1
 
 clean realclean:
--- dosemu-1.1.4/src/arch/linux/Makefile.main.orig	Wed Dec 18 02:36:44 2002
+++ dosemu-1.1.4/src/arch/linux/Makefile.main	Sat Jan 25 23:12:44 2003
@@ -8,7 +8,7 @@
 # You should do a "make" to compile and a "make install" as root to
 # install DOSEMU.
 
-INSTALL = install -c -o root
+INSTALL = install -c
 TMP = ../tmp
 COM = ../src/plugin/commands
 SYS = ../commands
@@ -273,11 +273,11 @@
 install:
 	rm -rf $(TMP)
 	mkdir -p -m 0755 $(TMP)/dosemu/freedos/dosemu
-	if [ ! -d $(dosemudir) ]; then \
-	  $(INSTALL) -d $(dosemudir); \
+	if [ ! -d $(DESTDIR)$(dosemudir) ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(dosemudir); \
 	fi
-	if [ ! -d $(syshdimagedir) ]; then \
-	  $(INSTALL) -d $(syshdimagedir); \
+	if [ ! -d $(DESTDIR)$(syshdimagedir) ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(syshdimagedir); \
 	fi
 	for i in aspi.sys cdrom.sys dumpconf.sys ems.sys emufs.sys fossil.com isemu.com mgarrot.com; do \
 	  $(INSTALL) -m 0644 $(SYS)/$$i $(TMP)/dosemu/freedos/dosemu; \
@@ -286,93 +286,93 @@
 	for i in `(cd $(COM); for i in *.com; do if [ -L $$i ]; then echo -n " $$i";fi;done)`; do \
 	  ln -sf generic.com $(TMP)/dosemu/freedos/dosemu/$$i; \
 	done
-	cp -a $(TMP)/dosemu/freedos $(dosemudir)
+	cp -a $(TMP)/dosemu/freedos $(DESTDIR)$(dosemudir)
 	cd $(TMP)/dosemu; \
 	for i in `find freedos -type f` ; do \
-	  ln -snf $(dosemudir)/$$i $$i; \
+	  ln -snf $(DESTDIR)$(dosemudir)/$$i $$i; \
 	done
 	tar -cf- -C $(TMP) dosemu/freedos | gzip -9 > $(TMP)/dosemu/dosemu-bin.tgz
-	$(INSTALL) -m 0644 $(TMP)/dosemu/dosemu-bin.tgz $(dosemudir)
+	$(INSTALL) -m 0644 $(TMP)/dosemu/dosemu-bin.tgz $(DESTDIR)$(dosemudir)
 	rm -rf $(TMP)
 	mkdir -p -m 0755 $(TMP)/dosemu/freedos/dosemu
 	if [ -f ../$(fdtarball) ]; then \
 	  tar -C $(dosemudir)/.. -xpzf ../dosemu-freedos-bin.tgz; \
 	  tar -C $(TMP) -xpzf ../dosemu-freedos-bin.tgz; \
 	  cd $(TMP)/dosemu; \
-	  rm -f FDchange.log $(dosemudir)/FDchange.log; \
-	  rm -f README.bindist $(dosemudir)/README.bindist; \
+	  rm -f FDchange.log $(DESTDIR)$(dosemudir)/FDchange.log; \
+	  rm -f README.bindist $(DESTDIR)$(dosemudir)/README.bindist; \
 	  for i in `find freedos -type f | grep -v autoexec.bat | grep -v config.sys` ; do \
-	    ln -snf $(dosemudir)/$$i $$i; \
+	    ln -snf $(DESTDIR)$(dosemudir)/$$i $$i; \
 	  done; \
-	  $(INSTALL) $(dosemudir)/freedos/config.sys freedos; \
-	  $(INSTALL) $(dosemudir)/freedos/autoexec.bat freedos; \
-	  cd .. ; tar -cf- dosemu |gzip -9 >$(dosemudir)/dosemu-freedos-bin.tgz; \
+	  $(INSTALL) $(DESTDIR)$(dosemudir)/freedos/config.sys freedos; \
+	  $(INSTALL) $(DESTDIR)$(dosemudir)/freedos/autoexec.bat freedos; \
+	  cd .. ; tar -cf- dosemu |gzip -9 >$(DESTDIR)$(dosemudir)/dosemu-freedos-bin.tgz; \
 	fi
 	sed -e "s|SYSTEM_INSTALL_PATH=NOT_SYSTEM_WIDE|SYSTEM_INSTALL_PATH=$(dosemudir)|" \
 	     -e "s|SYSTEM_CONF_PATH=NOT_SYSTEM_WIDE|SYSTEM_CONF_PATH=$(sysconfdir)|" \
 	     -e "s|SYSTEM_XFONTS_PATH=NOT_SYSTEM_WIDE|SYSTEM_XFONTS_PATH=$(x11fontdir)|" \
 	              ../dist/dosemu > $(TMP)/dosemu/dosemu
-	if [ ! -d $(sysconfdir) ]; then \
-	  $(INSTALL) -d $(sysconfdir); \
+	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(sysconfdir); \
 	fi
-	if [ ! -f $(sysconfdir)/dosemu.conf ]; then \
-	  $(INSTALL) -m 0644 ../etc/dosemu.conf ../etc/dosemu.users.easy ../etc/dosemu.users.secure $(sysconfdir); \
-	  $(INSTALL) -m 0644 ../etc/global.conf $(sysconfdir)/global.conf.example; \
+	if [ ! -f $(DESTDIR)$(sysconfdir)/dosemu.conf ]; then \
+	  $(INSTALL) -m 0644 ../etc/dosemu.conf ../etc/dosemu.users.easy ../etc/dosemu.users.secure $(DESTDIR)$(sysconfdir); \
+	  $(INSTALL) -m 0644 ../etc/global.conf $(DESTDIR)$(sysconfdir)/global.conf.example; \
 	fi
-	if [ ! -d $(dosemudir)/keymap ]; then \
-	  $(INSTALL) -d $(dosemudir)/keymap; \
-	  $(INSTALL) -m 0644 ../etc/keymap/* $(dosemudir)/keymap; \
+	if [ ! -d $(DESTDIR)$(dosemudir)/keymap ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(dosemudir)/keymap; \
+	  $(INSTALL) -m 0644 ../etc/keymap/* $(DESTDIR)$(dosemudir)/keymap; \
 	fi
-	$(INSTALL) -m 0755 ../bin/$(DOSBIN) $(bindir)
-	$(INSTALL) -m 0755 $(TMP)/dosemu/dosemu $(bindir)
-	$(INSTALL) -m 0644 ../bin/dosemu.map $(dosemudir)/dosemu-$(THISVERSION).map
-	$(INSTALL) -m 0755 ../bin/mkfatimage $(bindir)
-	$(INSTALL) -m 0755 ../bin/mkfatimage16 $(bindir)
+	$(INSTALL) -m 0755 ../bin/$(DOSBIN) $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 $(TMP)/dosemu/dosemu $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0644 ../bin/dosemu.map $(DESTDIR)$(dosemudir)/dosemu-$(THISVERSION).map
+	$(INSTALL) -m 0755 ../bin/mkfatimage $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 ../bin/mkfatimage16 $(DESTDIR)$(bindir)
 ifdef USE_SBEMU
-	$(INSTALL) -m 0755 ../bin/midid $(bindir)
+	$(INSTALL) -m 0755 ../bin/midid $(DESTDIR)$(bindir)
 endif
 ifdef  USE_MHPDBG
-	$(INSTALL) -m 0755 ../bin/dosdebug $(bindir)
+	$(INSTALL) -m 0755 ../bin/dosdebug $(DESTDIR)$(bindir)
 endif
-	if [ -f $(bindir)/xdosemu ]; then \
-		$(INSTALL) -m 0700 $(bindir)/xdosemu /tmp; \
-		rm -f $(bindir)/xdosemu; \
+	if [ -f $(DESTDIR)$(bindir)/xdosemu ]; then \
+		$(INSTALL) -m 0700 $(DESTDIR)$(bindir)/xdosemu /tmp; \
+		rm -f $(DESTDIR)$(bindir)/xdosemu; \
 	fi
-	if [ ! -d $(docdir) ]; then \
-	  $(INSTALL) -d $(docdir); \
+	if [ ! -d $(DESTDIR)$(docdir) ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(docdir); \
 	fi
-	$(INSTALL) -m 0644 ../README.bindist $(docdir)
+	$(INSTALL) -m 0644 ../README.bindist $(DESTDIR)$(docdir)
 	$(INSTALL) -m 0644 ../doc/{README,README-tech,dosemu-HOWTO,sound-usage}.txt \
-	   ../doc/announce $(docdir)
-	if [ ! -d $(mandir)/man1 ]; then \
-	  $(INSTALL) -d $(mandir)/man1; \
+	   ../doc/announce $(DESTDIR)$(docdir)
+	if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(mandir)/man1; \
 	fi
 	$(INSTALL) -m 0644 ../man/{mkfatimage16,dosemu,dosemu.bin,dosdebug}.1 \
-	   $(mandir)/man1
-	ln -sf dosemu.1 $(mandir)/man1/xdosemu.1
+	   $(DESTDIR)$(mandir)/man1
+	ln -sf dosemu.1 $(DESTDIR)$(mandir)/man1/xdosemu.1
 ifdef X_SUPPORT
-	if [ ! -e $(prefix)/xdosemu ]; then ln -s dosemu $(bindir)/xdosemu; fi
-	if [ ! -d $(x11fontdir) ]; then \
-	  $(INSTALL) -d $(x11fontdir); \
+	if [ ! -e $(DESTDIR)$(prefix)/xdosemu ]; then ln -s dosemu $(DESTDIR)$(bindir)/xdosemu; fi
+	if [ ! -d $(DESTDIR)$(x11fontdir) ]; then \
+	  $(INSTALL) -d $(DESTDIR)$(x11fontdir); \
 	fi
-	if [ -w $(x11fontdir) ] && \
-	    [ -d $(X11fontdir) ] && \
-	    [ ! -e $(x11fontdir)/vga.pcf ] && \
-	    [ ! -e $(x11fontdir)/vga.pcf.Z ] && \
-	    [ ! -e $(x11fontdir)/vga.pcf.gz ]; then \
+	if [ -w $(DESTDIR)$(x11fontdir) ] && \
+	    [ -d $(DESTDIR)$(X11fontdir) ] && \
+	    [ ! -e $(DESTDIR)$(x11fontdir)/vga.pcf ] && \
+	    [ ! -e $(DESTDIR)$(x11fontdir)/vga.pcf.Z ] && \
+	    [ ! -e $(DESTDIR)$(x11fontdir)/vga.pcf.gz ]; then \
 		echo "-> Main DOSEMU files installation done. Installing the X PC fonts..."; \
-		$(INSTALL) -m 0644 ../etc/vga.pcf $(x11fontdir); \
-		gzip -9 $(x11fontdir)/vga.pcf; \
-		bdftopcf ../etc/vga11x19.bdf | gzip -c -9 > $(x11fontdir)/vga11x19.pcf.gz; \
-		bdftopcf ../etc/vga-cp866.bdf | gzip -c -9 > $(x11fontdir)/vga-cp866.pcf.gz; \
-		bdftopcf ../etc/vga10x20-cp866.bdf | gzip -c -9 > $(x11fontdir)/vga10x20-cp866.pcf.gz; \
-		chmod 0644 $(x11fontdir)/vga11x19.pcf.gz $(x11fontdir)/vga-cp866.pcf.gz $(x11fontdir)/vga10x20-cp866.pcf.gz; \
-		if [ ! -f $(x11fontdir)/fonts.alias ]; then \
-		  $(INSTALL) -m 0644 ../etc/dosemu.alias $(x11fontdir)/fonts.alias; \
-		elif [ grep ^vga $(x11fontdir)/fonts.alias ]; then \
-	          cat ../etc/dosemu.alias >> $(x11fontdir)/fonts.alias; \
+		$(INSTALL) -m 0644 ../etc/vga.pcf $(DESTDIR)$(x11fontdir); \
+		gzip -9 $(DESTDIR)$(x11fontdir)/vga.pcf; \
+		bdftopcf ../etc/vga11x19.bdf | gzip -c -9 > $(DESTDIR)$(x11fontdir)/vga11x19.pcf.gz; \
+		bdftopcf ../etc/vga-cp866.bdf | gzip -c -9 > $(DESTDIR)$(x11fontdir)/vga-cp866.pcf.gz; \
+		bdftopcf ../etc/vga10x20-cp866.bdf | gzip -c -9 > $(DESTDIR)$(x11fontdir)/vga10x20-cp866.pcf.gz; \
+		chmod 0644 $(DESTDIR)$(x11fontdir)/vga11x19.pcf.gz $(DESTDIR)$(x11fontdir)/vga-cp866.pcf.gz $(DESTDIR)$(x11fontdir)/vga10x20-cp866.pcf.gz; \
+		if [ ! -f $(DESTDIR)$(x11fontdir)/fonts.alias ]; then \
+		  $(INSTALL) -m 0644 ../etc/dosemu.alias $(DESTDIR)$(x11fontdir)/fonts.alias; \
+		elif [ grep ^vga $(DESTDIR)$(x11fontdir)/fonts.alias ]; then \
+	          cat ../etc/dosemu.alias >> $(DESTDIR)$(x11fontdir)/fonts.alias; \
 		fi; \
-		cd $(x11fontdir); \
+		cd $(DESTDIR)$(x11fontdir); \
 		mkfontdir; \
 	fi;
 endif
--- dosemu-1.1.4/src/arch/linux/dosext/sound/midid/Makefile.orig	Wed Dec 18 02:36:44 2002
+++ dosemu-1.1.4/src/arch/linux/dosext/sound/midid/Makefile	Sun Jan 26 00:14:10 2003
@@ -15,7 +15,7 @@
 # No servicable parts below
 
 CC=gcc
-CFLAGS=-Wall -pipe -O -g
+CFLAGS=-Wall -pipe $(OPTFLAGS)
 LDFLAGS += -Wall
 OBJECTS=midid.o events.o io.o stats.o emulation.o device.o \
 oss.o midout.o timid.o null.o
Commit	Line	Data
5a6901a1 JB	1	--- dosemu-1.1.4/base-configure.in.orig Wed Dec 18 02:36:44 2002
	2	+++ dosemu-1.1.4/base-configure.in Sat Jan 25 23:00:39 2003
	3	@@ -532,14 +532,13 @@
	4	AC_SUBST(INCDIR)
	5
	6	if test "$dodebug" = "yes"; then
	7	- COPTFLAGS=" -g -Wall -D_DEBUG"
	8	- OPT="-O"
	9	+ COPTFLAGS=" -Wall -D_DEBUG"
	10	+ OPT="$OPTFLAGS"
	11	else
	12	COPTFLAGS=" -Wall"
	13	- OPT="-O2" # BIG NOTE: do _not_ use -O3,
	14	+ OPT="$OPTFLAGS" # BIG NOTE: do _not_ use -O3,
	15	# because in forces _inline_ at places where we don't want it !
	16	# If we want _inline_, well then we 'code' it.
	17	- OPT="$OPT -fomit-frame-pointer" # never omit the frame pointer when debugging!
e3be5d93	18	fi
e3be5d93	19
5a6901a1 JB	20	dnl CPU emulator
	21	@@ -625,32 +624,6 @@
	22	fi
	23
	24
	25	- # -m486 is usually in the specs for the compiler
	26	- # but gcc-3.0 wants -mcpu=i486 instead
	27	- # let the compiler options be dependent of the _target_
	28	- # where dosemu is compiled for, not the host
	29	- if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ; then
	30	- target_cpu="i686"
	31	- fi
	32	- if test "$GCC_VERSION_CODE" -ge 2095 ; then
	33	- OPT="$OPT -mcpu=$target_cpu"
	34	- else
	35	- case "$target_cpu" in
	36	- i486)
	37	- OPT="$OPT -m486"
	38	- ;;
	39	- i386)
	40	- OPT="$OPT -m386"
	41	- ;;
	42	- *)
	43	- ;;
	44	- esac
	45	- fi
	46	- if test "$target_cpu" = "athlon"; then
	47	- OPT="$OPT -malign-functions=4 -fexpensive-optimizations"
	48	- elif test "$target_cpu" = "i486"; then
	49	- OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
	50	- fi
	51	GCC_VERSION_CODE="-DGCC_VERSION_CODE=$GCC_VERSION_CODE"
	52
	53	echo -n "checking for glibc..."
e3be5d93	54	--- dosemu-1.0.1.orig/man/Makefile Sun Mar 5 13:57:36 2000
	55	+++ dosemu-1.0.1/man/Makefile Thu Aug 17 09:57:21 2000
	56	@@ -7,6 +7,6 @@
	57
	58	install:
	59	@install -d $(INSTROOT)/usr/man/man1; \
	60	- install dos.1 mkfatimage*.1 $(INSTROOT)/usr/man/man1
	61	+ install dos.1 mkfatimage*.1 $(INSTROOT)/usr/share/man/man1
	62
	63	clean realclean:
5a6901a1 JB	64	--- dosemu-1.1.4/src/arch/linux/Makefile.main.orig Wed Dec 18 02:36:44 2002
	65	+++ dosemu-1.1.4/src/arch/linux/Makefile.main Sat Jan 25 23:12:44 2003
	66	@@ -8,7 +8,7 @@
	67	# You should do a "make" to compile and a "make install" as root to
	68	# install DOSEMU.
	69
	70	-INSTALL = install -c -o root
	71	+INSTALL = install -c
	72	TMP = ../tmp
	73	COM = ../src/plugin/commands
	74	SYS = ../commands
	75	@@ -273,11 +273,11 @@
	76	install:
	77	rm -rf $(TMP)
	78	mkdir -p -m 0755 $(TMP)/dosemu/freedos/dosemu
	79	- if [ ! -d $(dosemudir) ]; then \
	80	- $(INSTALL) -d $(dosemudir); \
	81	+ if [ ! -d $(DESTDIR)$(dosemudir) ]; then \
	82	+ $(INSTALL) -d $(DESTDIR)$(dosemudir); \
	83	fi
	84	- if [ ! -d $(syshdimagedir) ]; then \
	85	- $(INSTALL) -d $(syshdimagedir); \
	86	+ if [ ! -d $(DESTDIR)$(syshdimagedir) ]; then \
	87	+ $(INSTALL) -d $(DESTDIR)$(syshdimagedir); \
	88	fi
	89	for i in aspi.sys cdrom.sys dumpconf.sys ems.sys emufs.sys fossil.com isemu.com mgarrot.com; do \
	90	$(INSTALL) -m 0644 $(SYS)/$$i $(TMP)/dosemu/freedos/dosemu; \
	91	@@ -286,93 +286,93 @@
	92	for i in `(cd $(COM); for i in *.com; do if [ -L $$i ]; then echo -n " $$i";fi;done)`; do \
	93	ln -sf generic.com $(TMP)/dosemu/freedos/dosemu/$$i; \
	94	done
	95	- cp -a $(TMP)/dosemu/freedos $(dosemudir)
	96	+ cp -a $(TMP)/dosemu/freedos $(DESTDIR)$(dosemudir)
	97	cd $(TMP)/dosemu; \
	98	for i in `find freedos -type f` ; do \
	99	- ln -snf $(dosemudir)/$$i $$i; \
	100	+ ln -snf $(DESTDIR)$(dosemudir)/$$i $$i; \
	101	done
	102	tar -cf- -C $(TMP) dosemu/freedos \| gzip -9 > $(TMP)/dosemu/dosemu-bin.tgz
	103	- $(INSTALL) -m 0644 $(TMP)/dosemu/dosemu-bin.tgz $(dosemudir)
	104	+ $(INSTALL) -m 0644 $(TMP)/dosemu/dosemu-bin.tgz $(DESTDIR)$(dosemudir)
	105	rm -rf $(TMP)
	106	mkdir -p -m 0755 $(TMP)/dosemu/freedos/dosemu
	107	if [ -f ../$(fdtarball) ]; then \
	108	tar -C $(dosemudir)/.. -xpzf ../dosemu-freedos-bin.tgz; \
	109	tar -C $(TMP) -xpzf ../dosemu-freedos-bin.tgz; \
	110	cd $(TMP)/dosemu; \
	111	- rm -f FDchange.log $(dosemudir)/FDchange.log; \
	112	- rm -f README.bindist $(dosemudir)/README.bindist; \
	113	+ rm -f FDchange.log $(DESTDIR)$(dosemudir)/FDchange.log; \
	114	+ rm -f README.bindist $(DESTDIR)$(dosemudir)/README.bindist; \
	115	for i in `find freedos -type f \| grep -v autoexec.bat \| grep -v config.sys` ; do \
	116	- ln -snf $(dosemudir)/$$i $$i; \
	117	+ ln -snf $(DESTDIR)$(dosemudir)/$$i $$i; \
	118	done; \
	119	- $(INSTALL) $(dosemudir)/freedos/config.sys freedos; \
	120	- $(INSTALL) $(dosemudir)/freedos/autoexec.bat freedos; \
	121	- cd .. ; tar -cf- dosemu \|gzip -9 >$(dosemudir)/dosemu-freedos-bin.tgz; \
	122	+ $(INSTALL) $(DESTDIR)$(dosemudir)/freedos/config.sys freedos; \
	123	+ $(INSTALL) $(DESTDIR)$(dosemudir)/freedos/autoexec.bat freedos; \
	124	+ cd .. ; tar -cf- dosemu \|gzip -9 >$(DESTDIR)$(dosemudir)/dosemu-freedos-bin.tgz; \
	125	fi
	126	sed -e "s\|SYSTEM_INSTALL_PATH=NOT_SYSTEM_WIDE\|SYSTEM_INSTALL_PATH=$(dosemudir)\|" \
	127	-e "s\|SYSTEM_CONF_PATH=NOT_SYSTEM_WIDE\|SYSTEM_CONF_PATH=$(sysconfdir)\|" \
128	-e "s\|SYSTEM_XFONTS_PATH=NOT_SYSTEM_WIDE\|SYSTEM_XFONTS_PATH=$(x11fontdir)\|" \
129	../dist/dosemu > $(TMP)/dosemu/dosemu
130	- if [ ! -d $(sysconfdir) ]; then \
131	- $(INSTALL) -d $(sysconfdir); \
132	+ if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
133	+ $(INSTALL) -d $(DESTDIR)$(sysconfdir); \
134	fi
135	- if [ ! -f $(sysconfdir)/dosemu.conf ]; then \
136	- $(INSTALL) -m 0644 ../etc/dosemu.conf ../etc/dosemu.users.easy ../etc/dosemu.users.secure $(sysconfdir); \
137	- $(INSTALL) -m 0644 ../etc/global.conf $(sysconfdir)/global.conf.example; \
138	+ if [ ! -f $(DESTDIR)$(sysconfdir)/dosemu.conf ]; then \
139	+ $(INSTALL) -m 0644 ../etc/dosemu.conf ../etc/dosemu.users.easy ../etc/dosemu.users.secure $(DESTDIR)$(sysconfdir); \
140	+ $(INSTALL) -m 0644 ../etc/global.conf $(DESTDIR)$(sysconfdir)/global.conf.example; \
141	fi
142	- if [ ! -d $(dosemudir)/keymap ]; then \
143	- $(INSTALL) -d $(dosemudir)/keymap; \
144	- $(INSTALL) -m 0644 ../etc/keymap/* $(dosemudir)/keymap; \
145	+ if [ ! -d $(DESTDIR)$(dosemudir)/keymap ]; then \
146	+ $(INSTALL) -d $(DESTDIR)$(dosemudir)/keymap; \
147	+ $(INSTALL) -m 0644 ../etc/keymap/* $(DESTDIR)$(dosemudir)/keymap; \
148	fi
149	- $(INSTALL) -m 0755 ../bin/$(DOSBIN) $(bindir)
150	- $(INSTALL) -m 0755 $(TMP)/dosemu/dosemu $(bindir)
151	- $(INSTALL) -m 0644 ../bin/dosemu.map $(dosemudir)/dosemu-$(THISVERSION).map
152	- $(INSTALL) -m 0755 ../bin/mkfatimage $(bindir)
153	- $(INSTALL) -m 0755 ../bin/mkfatimage16 $(bindir)
154	+ $(INSTALL) -m 0755 ../bin/$(DOSBIN) $(DESTDIR)$(bindir)
155	+ $(INSTALL) -m 0755 $(TMP)/dosemu/dosemu $(DESTDIR)$(bindir)
156	+ $(INSTALL) -m 0644 ../bin/dosemu.map $(DESTDIR)$(dosemudir)/dosemu-$(THISVERSION).map
157	+ $(INSTALL) -m 0755 ../bin/mkfatimage $(DESTDIR)$(bindir)
158	+ $(INSTALL) -m 0755 ../bin/mkfatimage16 $(DESTDIR)$(bindir)
159	ifdef USE_SBEMU
160	- $(INSTALL) -m 0755 ../bin/midid $(bindir)
161	+ $(INSTALL) -m 0755 ../bin/midid $(DESTDIR)$(bindir)
162	endif
e3be5d93	163	ifdef USE_MHPDBG
5a6901a1 JB	164	- $(INSTALL) -m 0755 ../bin/dosdebug $(bindir)
5a6901a1 JB	165	+ $(INSTALL) -m 0755 ../bin/dosdebug $(DESTDIR)$(bindir)
e3be5d93	166	endif
5a6901a1 JB	167	- if [ -f $(bindir)/xdosemu ]; then \
	168	- $(INSTALL) -m 0700 $(bindir)/xdosemu /tmp; \
	169	- rm -f $(bindir)/xdosemu; \
	170	+ if [ -f $(DESTDIR)$(bindir)/xdosemu ]; then \
	171	+ $(INSTALL) -m 0700 $(DESTDIR)$(bindir)/xdosemu /tmp; \
	172	+ rm -f $(DESTDIR)$(bindir)/xdosemu; \
	173	fi
	174	- if [ ! -d $(docdir) ]; then \
	175	- $(INSTALL) -d $(docdir); \
	176	+ if [ ! -d $(DESTDIR)$(docdir) ]; then \
	177	+ $(INSTALL) -d $(DESTDIR)$(docdir); \
	178	fi
	179	- $(INSTALL) -m 0644 ../README.bindist $(docdir)
	180	+ $(INSTALL) -m 0644 ../README.bindist $(DESTDIR)$(docdir)
	181	$(INSTALL) -m 0644 ../doc/{README,README-tech,dosemu-HOWTO,sound-usage}.txt \
	182	- ../doc/announce $(docdir)
	183	- if [ ! -d $(mandir)/man1 ]; then \
	184	- $(INSTALL) -d $(mandir)/man1; \
	185	+ ../doc/announce $(DESTDIR)$(docdir)
	186	+ if [ ! -d $(DESTDIR)$(mandir)/man1 ]; then \
	187	+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1; \
	188	fi
	189	$(INSTALL) -m 0644 ../man/{mkfatimage16,dosemu,dosemu.bin,dosdebug}.1 \
	190	- $(mandir)/man1
	191	- ln -sf dosemu.1 $(mandir)/man1/xdosemu.1
	192	+ $(DESTDIR)$(mandir)/man1
	193	+ ln -sf dosemu.1 $(DESTDIR)$(mandir)/man1/xdosemu.1
	194	ifdef X_SUPPORT
	195	- if [ ! -e $(prefix)/xdosemu ]; then ln -s dosemu $(bindir)/xdosemu; fi
	196	- if [ ! -d $(x11fontdir) ]; then \
	197	- $(INSTALL) -d $(x11fontdir); \
	198	+ if [ ! -e $(DESTDIR)$(prefix)/xdosemu ]; then ln -s dosemu $(DESTDIR)$(bindir)/xdosemu; fi
	199	+ if [ ! -d $(DESTDIR)$(x11fontdir) ]; then \
	200	+ $(INSTALL) -d $(DESTDIR)$(x11fontdir); \
	201	fi
	202	- if [ -w $(x11fontdir) ] && \
	203	- [ -d $(X11fontdir) ] && \
	204	- [ ! -e $(x11fontdir)/vga.pcf ] && \
	205	- [ ! -e $(x11fontdir)/vga.pcf.Z ] && \
	206	- [ ! -e $(x11fontdir)/vga.pcf.gz ]; then \
	207	+ if [ -w $(DESTDIR)$(x11fontdir) ] && \
	208	+ [ -d $(DESTDIR)$(X11fontdir) ] && \
	209	+ [ ! -e $(DESTDIR)$(x11fontdir)/vga.pcf ] && \
	210	+ [ ! -e $(DESTDIR)$(x11fontdir)/vga.pcf.Z ] && \
	211	+ [ ! -e $(DESTDIR)$(x11fontdir)/vga.pcf.gz ]; then \
	212	echo "-> Main DOSEMU files installation done. Installing the X PC fonts..."; \
	213	- $(INSTALL) -m 0644 ../etc/vga.pcf $(x11fontdir); \
	214	- gzip -9 $(x11fontdir)/vga.pcf; \
	215	- bdftopcf ../etc/vga11x19.bdf \| gzip -c -9 > $(x11fontdir)/vga11x19.pcf.gz; \
	216	- bdftopcf ../etc/vga-cp866.bdf \| gzip -c -9 > $(x11fontdir)/vga-cp866.pcf.gz; \
	217	- bdftopcf ../etc/vga10x20-cp866.bdf \| gzip -c -9 > $(x11fontdir)/vga10x20-cp866.pcf.gz; \
	218	- chmod 0644 $(x11fontdir)/vga11x19.pcf.gz $(x11fontdir)/vga-cp866.pcf.gz $(x11fontdir)/vga10x20-cp866.pcf.gz; \
	219	- if [ ! -f $(x11fontdir)/fonts.alias ]; then \
	220	- $(INSTALL) -m 0644 ../etc/dosemu.alias $(x11fontdir)/fonts.alias; \
	221	- elif [ grep ^vga $(x11fontdir)/fonts.alias ]; then \
	222	- cat ../etc/dosemu.alias >> $(x11fontdir)/fonts.alias; \
	223	+ $(INSTALL) -m 0644 ../etc/vga.pcf $(DESTDIR)$(x11fontdir); \
	224	+ gzip -9 $(DESTDIR)$(x11fontdir)/vga.pcf; \
	225	+ bdftopcf ../etc/vga11x19.bdf \| gzip -c -9 > $(DESTDIR)$(x11fontdir)/vga11x19.pcf.gz; \
	226	+ bdftopcf ../etc/vga-cp866.bdf \| gzip -c -9 > $(DESTDIR)$(x11fontdir)/vga-cp866.pcf.gz; \
	227	+ bdftopcf ../etc/vga10x20-cp866.bdf \| gzip -c -9 > $(DESTDIR)$(x11fontdir)/vga10x20-cp866.pcf.gz; \
	228	+ chmod 0644 $(DESTDIR)$(x11fontdir)/vga11x19.pcf.gz $(DESTDIR)$(x11fontdir)/vga-cp866.pcf.gz $(DESTDIR)$(x11fontdir)/vga10x20-cp866.pcf.gz; \
	229	+ if [ ! -f $(DESTDIR)$(x11fontdir)/fonts.alias ]; then \
	230	+ $(INSTALL) -m 0644 ../etc/dosemu.alias $(DESTDIR)$(x11fontdir)/fonts.alias; \
231	+ elif [ grep ^vga $(DESTDIR)$(x11fontdir)/fonts.alias ]; then \
232	+ cat ../etc/dosemu.alias >> $(DESTDIR)$(x11fontdir)/fonts.alias; \
233	fi; \
234	- cd $(x11fontdir); \
235	+ cd $(DESTDIR)$(x11fontdir); \
236	mkfontdir; \
237	fi;
238	endif
239	--- dosemu-1.1.4/src/arch/linux/dosext/sound/midid/Makefile.orig Wed Dec 18 02:36:44 2002
240	+++ dosemu-1.1.4/src/arch/linux/dosext/sound/midid/Makefile Sun Jan 26 00:14:10 2003
241	@@ -15,7 +15,7 @@
242	# No servicable parts below
243
244	CC=gcc
245	-CFLAGS=-Wall -pipe -O -g
246	+CFLAGS=-Wall -pipe $(OPTFLAGS)
247	LDFLAGS += -Wall
248	OBJECTS=midid.o events.o io.o stats.o emulation.o device.o \
249	oss.o midout.o timid.o null.o