summarylogtreecommitdiffstats
path: root/fix-build.patch
blob: e7d109f6a6774d179616dbfa3b175469c8399745 (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
diff -Naur z88dk.old/build.sh z88dk/build.sh
--- z88dk.old/build.sh	2017-01-02 20:00:20.000000000 +0100
+++ z88dk/build.sh	2017-05-06 00:15:52.089731837 +0200
@@ -49,7 +49,7 @@
 
 export INSTALL
 
-$MAKE -e
+$MAKE
 $MAKE -C `pwd`/libsrc
 $MAKE -C `pwd`/libsrc install
 $MAKE -C `pwd`/libsrc/_DEVELOPMENT
diff -Naur z88dk.old/Makefile z88dk/Makefile
--- z88dk.old/Makefile	2016-09-09 20:00:16.000000000 +0200
+++ z88dk/Makefile	2017-05-06 00:20:51.113124076 +0200
@@ -78,12 +78,12 @@
 	cd libsrc ; $(MAKE) install
 
 install-libs:
-	mkdir -p $(prefix)/lib/z88dk/lib/config
-	cp -R lib/config/* $(prefix)/lib/z88dk/lib/config/
-	find $(prefix)/lib/z88dk/lib/config -type f | xargs chmod 644
-	mkdir -p $(prefix)/lib/z88dk/lib/clibs
-	cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/
-	find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
+	mkdir -p $(DESTDIR)/$(prefix)/lib/z88dk/lib/config
+	cp -R lib/config/* $(DESTDIR)/$(prefix)/lib/z88dk/lib/config/
+	find $(DESTDIR)/$(prefix)/lib/z88dk/lib/config -type f | xargs chmod 644
+	mkdir -p $(DESTDIR)/$(prefix)/lib/z88dk/lib/clibs
+	cp -R lib/clibs/* $(DESTDIR)/$(prefix)/lib/z88dk/lib/clibs/
+	find $(DESTDIR)/$(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
 
 install:
 	mkdir -p -m 755 $(DESTDIR)/$(prefix)/bin $(DESTDIR)/$(prefix_share)/z88dk
@@ -95,7 +95,12 @@
 	cd src/cpp ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
 	cd src/sccz80 ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
 	cd src/z80asm ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
+	cd src/z80nm ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
 	cd src/zcc ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
+	cd src/scanner ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
+	cd src/zx7 ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
+	cd src/ticks ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
+	cd support/graphics ; $(MAKE) PREFIX=$(DESTDIR)/$(prefix) install
 	./config.sh $(prefix_share)/z88dk/ $(DEFAULT)
 	cp -R -p include $(DESTDIR)/$(prefix_share)/z88dk
 	cp -R -p lib $(DESTDIR)/$(prefix_share)/z88dk