summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.build2
-rw-r--r--Makefile.cross2
-rw-r--r--Makefile.in4
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.build b/Makefile.build
index 857eb2554099..a13aa834028b 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -7,7 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+ifeq (,$(SOLARENV))
include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk
+endif
gb_Side := host
include $(SOLARENV)/gbuild/gbuild.mk
diff --git a/Makefile.cross b/Makefile.cross
index dd5cf810da6d..711ee269fe63 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_build.mk
+include $(BUILDDIR)/config_build.mk
gb_Side := build
include $(SOLARENV)/gbuild/gbuild.mk
diff --git a/Makefile.in b/Makefile.in
index 7cd9548c02a2..09788ff8ed1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -126,11 +126,11 @@ distclean : clean compilerplugins-clean
$(BUILDDIR)/config_host.mk \
$(BUILDDIR)/config_host.mk.stamp \
$(BUILDDIR)/config_host/*.h \
+ $(BUILDDIR)/config_host/*.mk \
$(BUILDDIR)/configure \
$(BUILDDIR)/instsetoo_native/util/openoffice.lst \
$(BUILDDIR)/lo.xcent \
- $(BUILDDIR)/solenv/inc/minor.mk \
- $(BUILDDIR)/warn
+ $(BUILDDIR)/solenv/inc/minor.mk
find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
#