blob: 58970b884070ea23f45114c82ae6cfe9a0c750e6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
diff --git a/src/arch/linux/Makefile.main b/src/arch/linux/Makefile.main
index 3fbf825..f122607 100644
--- a/src/arch/linux/Makefile.main
+++ b/src/arch/linux/Makefile.main
@@ -9,7 +9,7 @@
# install DOSEMU.
SYS = ../commands
-dosemudir = $(datadir)/dosemu
+dosemudir = $(libdir)/dosemu
NET=dosext/net
@@ -215,7 +215,6 @@ install:
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) -m 0755 ../bin/$(DOSBIN) $(DESTDIR)$(bindir)
$(INSTALL) -m 0755 ../bin/dosemu $(DESTDIR)$(bindir)
- $(INSTALL) -m 0755 ../bin/mkfatimage $(DESTDIR)$(bindir)
$(INSTALL) -m 0755 ../bin/mkfatimage16 $(DESTDIR)$(bindir)
ifdef USE_SBEMU
$(INSTALL) -m 0755 ../bin/midid $(DESTDIR)$(bindir)
@@ -230,7 +229,7 @@ endif
fi; \
done
$(INSTALL) -d $(DESTDIR)$(docdir)
- for i in README.bindist NEWS THANKS COPYING COPYING.DOSEMU BUGS ChangeLog; do \
+ for i in README.bindist NEWS THANKS BUGS ChangeLog; do \
$(INSTALL) -m 0644 $(REALTOPDIR)/$$i $(DESTDIR)$(docdir); \
done
for i in README README-tech dosemu-HOWTO sound-usage DANG EMUfailure \
diff --git a/src/emu.c b/src/emu.c
index 94ffa6a..87c8481 100644
--- a/src/emu.c
+++ b/src/emu.c
@@ -248,8 +248,8 @@ void do_liability_disclaimer_prompt(int dosboot, int prompt)
".\nCopyright (C) 1992-2006 the 'DOSEMU-Development-Team'.\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files\n"
- "COPYING.DOSEMU and COPYING for more details.\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the file\n"
+ "/usr/share/doc/dosemu/copyright for more details.\n"
"Use this program at your own risk!\n\n";
static char text2[] =
diff --git a/src/tools/periph/Makefile b/src/tools/periph/Makefile
index 4abff44..a7058b4 100644
--- a/src/tools/periph/Makefile
+++ b/src/tools/periph/Makefile
@@ -11,12 +11,12 @@ include $(top_builddir)/Makefile.conf
D=$(REALTOPDIR)/etc
IDEST=/var/lib
-CFILES=hdinfo.c mkhdimage.c putrom.c mkfatimage.c mkfatimage16.c \
+CFILES=hdinfo.c mkhdimage.c putrom.c mkfatimage16.c \
dexeconfig.c scsicheck.c dosctrl.c vbioscheck.c
SFILES=bootsect.S
SRC=$(CFILES) $(SFILES)
OBJ1=hdinfo mkhdimage putrom dexeconfig scsicheck dosctrl vbioscheck
-OBJ=$(OBJ1) $(BINPATH)/bin/mkfatimage $(BINPATH)/bin/mkfatimage16
+OBJ=$(OBJ1) $(BINPATH)/bin/mkfatimage16
SCRIPT=getrom
ALL_CPPFLAGS += -I.
|