wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 927260 - Invoke the right gmake when building gaia. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2013-10-17 07:56:34 +09:00
parent be2996dce1
commit 9fd85c40bb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
b2g/gaia/Makefile.in
View File

@ -9,13 +9,18 @@ DEFINES += \
-DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \ -DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
-DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \ -DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \
$(NULL) $(NULL)
GAIA_MAKE=make
else # Non-windows machines use the same wrapper program else # Non-windows machines use the same wrapper program
CSRCS = run-b2g.c CSRCS = run-b2g.c
DEFINES += \ DEFINES += \
-DB2G_NAME=\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \ -DB2G_NAME=\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
-DGAIA_PATH=\"$(GAIA_PATH)\" \ -DGAIA_PATH=\"$(GAIA_PATH)\" \
$(NULL) $(NULL)
endif
ifdef .PYMAKE
# For use of GNU make in pymake builds.
GAIA_MAKE=$(GMAKE)
else
GAIA_MAKE=$(MAKE) GAIA_MAKE=$(MAKE)
endif endif
@ -27,6 +32,6 @@ GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
libs:: libs::
$(GAIA_MAKE) -j1 -C $(GAIADIR) clean +$(GAIA_MAKE) -j1 -C $(GAIADIR) clean
$(GAIA_MAKE) -j1 -C $(GAIADIR) profile +$(GAIA_MAKE) -j1 -C $(GAIADIR) profile
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -) (cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)