Makefile.build | 2 ++ Makefile.cross | 2 +- Makefile.in | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 2057218fbc9a688fe8d3aff64634d8826e4b6ebe Author: Matúš Kukan <matus.ku...@gmail.com> Date: Thu Feb 28 09:51:12 2013 +0100 fix BUILDDIR <> SRCDIR in makefiles Change-Id: I7b6cc6b638cec5e552492548a878325b3fe1119d diff --git a/Makefile.build b/Makefile.build index 857eb25..a13aa83 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 dd5cf81..711ee26 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 7cd9548..09788ff 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 {} \; #
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits