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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
Use shell MAKE variable to allow parallel builds.
Index: fbreader/Makefile
===================================================================
--- fbreader.orig/Makefile 2010-03-24 18:33:27.422166701 +0200
+++ fbreader/Makefile 2010-03-24 18:33:43.463174070 +0200
@@ -21,21 +21,21 @@
do_install:
@for dir in $(ZLIBDIRS) $(APPDIRS); do \
if [ -d $$dir ]; then \
- cd $$dir; make $@; cd $(ROOTDIR); \
+ cd $$dir; $(MAKE) $@; cd $(ROOTDIR); \
fi; \
done
do_install_dev:
@for dir in $(ZLIBDIRS); do \
if [ -d $$dir ]; then \
- cd $$dir; make $@; cd $(ROOTDIR); \
+ cd $$dir; $(MAKE) $@; cd $(ROOTDIR); \
fi; \
done
clean:
@for dir in $(ZLIBDIRS) $(APPDIRS); do \
if [ -d $$dir ]; then \
- cd $$dir; make $@; cd $(ROOTDIR); \
+ cd $$dir; $(MAKE) $@; cd $(ROOTDIR); \
fi; \
done
Index: fbreader/fbreader/Makefile
===================================================================
--- fbreader.orig/fbreader/Makefile 2010-03-24 18:33:27.422166701 +0200
+++ fbreader/fbreader/Makefile 2010-03-24 18:33:43.463174070 +0200
@@ -61,13 +61,13 @@
@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
@install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
- @make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
+ @$(MAKE) -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
clean:
@for subdir in $(ALL_SUBDIRS); do \
$(MAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk clean; \
done;
@for subdir in $(ALL_ARCHSUBDIRS); do \
- cd $$subdir; make clean; cd ..; \
+ cd $$subdir; $(MAKE) clean; cd ..; \
done;
@$(RM) $(TARGET) err
Index: fbreader/zlibrary/core/Makefile
===================================================================
--- fbreader.orig/zlibrary/core/Makefile 2010-03-24 18:33:27.462169522 +0200
+++ fbreader/zlibrary/core/Makefile 2010-03-24 18:33:43.463174070 +0200
@@ -38,7 +38,7 @@
endif
.objects:
- @for subdir in $(SUBDIRS); do \
+ +@for subdir in $(SUBDIRS); do \
if [ -d $$subdir ]; then \
if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \
exit 1; \
Index: fbreader/zlibrary/text/Makefile
===================================================================
--- fbreader.orig/zlibrary/text/Makefile 2010-03-24 18:33:27.462169522 +0200
+++ fbreader/zlibrary/text/Makefile 2010-03-24 18:33:43.463174070 +0200
@@ -22,7 +22,7 @@
SUBDIRS = src/model src/area src/view src/style src/styleOptions src/hyphenation
.objects:
- @for subdir in $(SUBDIRS); do \
+ +@for subdir in $(SUBDIRS); do \
if [ -d $$subdir ]; then \
if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \
exit 1; \
Index: fbreader/zlibrary/ui/Makefile
===================================================================
--- fbreader.orig/zlibrary/ui/Makefile 2010-03-24 18:33:39.851175366 +0200
+++ fbreader/zlibrary/ui/Makefile 2010-03-24 18:33:43.463174070 +0200
@@ -80,21 +80,21 @@
endif
.objects:
- @for subdir in $(SUBDIRS); do \
+ +@for subdir in $(SUBDIRS); do \
if [ -d $$subdir ]; then \
if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \
exit 1; \
fi; \
fi; \
done;
- @for subdir in $(QTSUBDIRS); do \
+ +@for subdir in $(QTSUBDIRS); do \
if [ -d $$subdir ]; then \
if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/qsubdir.mk; then \
exit 1; \
fi; \
fi; \
done;
- @for subdir in $(GTKSUBDIRS); do \
+ +@for subdir in $(GTKSUBDIRS); do \
if [ -d $$subdir ]; then \
if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/gtksubdir.mk; then \
exit 1; \
|
