diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-06 16:36:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 14:27:50 -0600 |
| commit | b8002169336b6b7597d32755e41fa3dc2688539e (patch) | |
| tree | dde6d4ce209e09aa2140575aa1f8386144f76af6 /Makefile.in | |
| parent | 7fb73e6c30e66f028fe759376e3789456bf3ad33 (diff) | |
remove INPATH and PROEXT
- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME
Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 0c384044c953..4f2589556ae3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,7 +233,7 @@ bootstrap: compilerplugins # # Note: if invoked as "make check" this will also run subsequentcheck! # -build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) mkdir -p $(INSTDIR) && install-gdb-printers -a $(INSTDIR) -c endif @@ -243,7 +243,7 @@ ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif -build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) +build-nocheck: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build cross-toolset: bootstrap fetch @@ -339,7 +339,7 @@ findunusedcode: @mkdir -p $(SRCDIR)/callcatcher/config_host @cp config_host/* callcatcher/config_host @cp config_host.mk* callcatcher - @sed -e s,$$INPATH,callcatcher,g config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/callcatcher/config_host.mk + @cat config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/callcatcher/config_host.mk @sed -i -e s,g++,"callcatcher g++",g $(SRCDIR)/callcatcher/config_host.mk @sed -i -e s,gcc,"callcatcher gcc",g $(SRCDIR)/callcatcher/config_host.mk @echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk |