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
|
Fix make[1]: warning: jobserver unavailable: using -j1. Add `+' to parent make rule
https://bugs.gentoo.org/show_bug.cgi?id=259115
Patch written by Kacper Kowalik <xarthisius@gentoo.org>
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,8 +19,8 @@ TARFILES = README README.hacking README.VMS INSTALL \
TAR = tar
-MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
-MAKE_SUBDIR2 = for dir in $(SUBDIRS2);do (cd $$dir; $(MAKE) $@) || exit 5; done
+MAKE_SUBDIR = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done
+MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
default::
@$(MAKE_SUBDIR)
@@ -45,7 +45,7 @@ depend::
distdepend::
@$(MAKE) update_spec_version
@$(MAKE_SUBDIR2)
- @cd po ; $(MAKE) update-po
+ @$(MAKE) -C po update-po
TAGS:: tags
tags::
@@ -284,7 +284,7 @@ test-tar::
chmod -R u+w .
dmg::
- cd OSX ; $(MAKE) release dmg
+ $(MAKE) -C OSX release dmg
www::
@ \
@@ -349,8 +349,7 @@ www::
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\
- (cd ..; $(MAKE) xscreensaver/changelog.html \
- xscreensaver/screenshots/index.html ); \
+ $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
cvs diff -U0 changelog.html ; \
set +x ; \
\
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -732,8 +732,7 @@ $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c
$(UTILS_BIN)/colorbars.o: $(UTILS_SRC)/colorbars.c
$(SAVER_UTIL_OBJS):
- cd $(UTILS_BIN) ; \
- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
# How we build object files in this directory.
.c.o:
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -517,8 +517,7 @@ $(UTILS_BIN)/xdbe.o: $(UTILS_SRC)/xdbe.c
$(UTILS_BIN)/textclient.o: $(UTILS_SRC)/textclient.c
$(UTIL_OBJS):
- cd $(UTILS_BIN) ; \
- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
# How we build object files in this directory.
.c.o:
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -464,11 +464,10 @@ $(UTILS_BIN)/xshm.o: $(UTILS_SRC)/xshm.c
$(UTILS_BIN)/textclient.o: $(UTILS_SRC)/textclient.c
$(UTIL_OBJS):
- cd $(UTILS_BIN) ; \
- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
$(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c
- cd $(HACK_BIN) ; $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
+ $(MAKE) -C $(HACK_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)"
# How we build object files in this directory.
|
GitWeb