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
6 if test "$dodebug" = "yes"; then
7 - COPTFLAGS=" -g -Wall -D_DEBUG"
9 + COPTFLAGS=" -Wall -D_DEBUG"
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!
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
32 - if test "$GCC_VERSION_CODE" -ge 2095 ; then
33 - OPT="$OPT -mcpu=$target_cpu"
35 - case "$target_cpu" in
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"
51 GCC_VERSION_CODE="-DGCC_VERSION_CODE=$GCC_VERSION_CODE"
53 echo -n "checking for glibc..."
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
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
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
67 # You should do a "make" to compile and a "make install" as root to
70 -INSTALL = install -c -o root
73 COM = ../src/plugin/commands
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); \
84 - if [ ! -d $(syshdimagedir) ]; then \
85 - $(INSTALL) -d $(syshdimagedir); \
86 + if [ ! -d $(DESTDIR)$(syshdimagedir) ]; then \
87 + $(INSTALL) -d $(DESTDIR)$(syshdimagedir); \
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; \
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; \
95 - cp -a $(TMP)/dosemu/freedos $(dosemudir)
96 + cp -a $(TMP)/dosemu/freedos $(DESTDIR)$(dosemudir)
98 for i in `find freedos -type f` ; do \
99 - ln -snf $(dosemudir)/$$i $$i; \
100 + ln -snf $(DESTDIR)$(dosemudir)/$$i $$i; \
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)
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; \
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; \
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; \
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); \
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; \
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; \
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)
160 - $(INSTALL) -m 0755 ../bin/midid $(bindir)
161 + $(INSTALL) -m 0755 ../bin/midid $(DESTDIR)$(bindir)
164 - $(INSTALL) -m 0755 ../bin/dosdebug $(bindir)
165 + $(INSTALL) -m 0755 ../bin/dosdebug $(DESTDIR)$(bindir)
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; \
174 - if [ ! -d $(docdir) ]; then \
175 - $(INSTALL) -d $(docdir); \
176 + if [ ! -d $(DESTDIR)$(docdir) ]; then \
177 + $(INSTALL) -d $(DESTDIR)$(docdir); \
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; \
189 $(INSTALL) -m 0644 ../man/{mkfatimage16,dosemu,dosemu.bin,dosdebug}.1 \
191 - ln -sf dosemu.1 $(mandir)/man1/xdosemu.1
192 + $(DESTDIR)$(mandir)/man1
193 + ln -sf dosemu.1 $(DESTDIR)$(mandir)/man1/xdosemu.1
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); \
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; \
234 - cd $(x11fontdir); \
235 + cd $(DESTDIR)$(x11fontdir); \
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
242 # No servicable parts below
245 -CFLAGS=-Wall -pipe -O -g
246 +CFLAGS=-Wall -pipe $(OPTFLAGS)
248 OBJECTS=midid.o events.o io.o stats.o emulation.o device.o \
249 oss.o midout.o timid.o null.o