]>
Commit | Line | Data |
---|---|---|
3a30e2d7 JR |
1 | --- icedove-6.0/mozilla/mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300 |
2 | +++ icedove-6.0/mozilla/mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300 | |
3 | @@ -26,22 +26,6 @@ | |
4 | @exit 1 | |
5 | endif | |
8d3ddb82 | 6 | |
8d3ddb82 | 7 | -$(topsrcdir)/configure: $(topsrcdir)/configure.in |
3a30e2d7 JR |
8 | -$(topsrcdir)/js/src/configure: $(topsrcdir)/js/src/configure.in |
9 | -$(topsrcdir)/configure $(topsrcdir)/js/src/configure: | |
8d3ddb82 | 10 | - @echo "STOP! configure.in has changed, and your configure is out of date." |
11 | - @echo "Please rerun autoconf and configure." | |
12 | - @echo "To ignore this message, touch 'configure' in the source directory." | |
13 | - @exit 1 | |
14 | - | |
15 | -config.status: $(topsrcdir)/configure | |
3a30e2d7 JR |
16 | -js/src/config.status: $(topsrcdir)/js/src/configure |
17 | -config.status js/src/config.status: | |
8d3ddb82 | 18 | - @echo "STOP! configure has changed and needs to be run in this build directory." |
19 | - @echo "Please rerun configure." | |
20 | - @echo "To ignore this message, touch 'config.status' in the build directory." | |
21 | - @exit 1 | |
22 | - | |
3a30e2d7 JR |
23 | # Regenerate the build backend if it is out of date. We only have this rule in |
24 | # this main make file because having it in rules.mk and applied to partial tree | |
25 | # builds resulted in a world of hurt. Gory details are in bug 877308. | |
26 | --- icedove-6.0/mozilla/mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300 | |
27 | +++ icedove-6.0/mozilla/mozilla/client.mk 2011-08-26 13:10:11.365956960 +0300 | |
f4114a7f ER |
28 | @@ -278,8 +278,8 @@ |
29 | $(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \ | |
30 | $(NULL) | |
31 | ||
32 | -$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS) | |
33 | - @echo Generating $@ using autoconf | |
34 | +$(CONFIGURES): | |
35 | + echo Generating $@ using autoconf | |
36 | cd $(@D); $(AUTOCONF) | |
37 | ||
38 | CONFIG_STATUS_DEPS := \ |