diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-11 14:24:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-11 14:26:07 +0200 |
| commit | 11545b91d539b5c354c1423755be2a3809794bb6 (patch) | |
| tree | d6a7716b5830f10b946108c5a49f76fd529e621e | |
| parent | ef52dd9f94851da829b9f6c33931b13728f84691 (diff) | |
Revert "make it possible to do 'make -C sw/' even with builddir!=srcdir"
This reverts commit 11e881a63821ea209bda509d1e502d9ba270782d, which assumed that
"all the Makefile's using it are in builddir/<module>/", which is not the case
for the external/ sub-modules.
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | solenv/gbuild/partial_build.mk | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/autogen.sh b/autogen.sh index da967a420c9c..f15dd91a534d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -135,13 +135,6 @@ if ($src_path ne $build_path) { system ("ln -sf $src_path/configure.ac configure.ac"); system ("ln -sf $src_path/g g"); - my @modules = <$src_path/*/Makefile>; - foreach my $module (@modules) - { - my $dir = basename (dirname ($module)); - mkdir ($dir); - system ("ln -sf $src_path/$dir/Makefile $dir/Makefile"); - } } system ("$aclocal $aclocal_flags") && die "Failed to run aclocal"; unlink ("configure"); diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index eb2b5ccee365..68e807b97615 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -22,7 +22,7 @@ gb_Side:=host endif ifeq (,$(BUILDDIR)) -BUILDDIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST)))).. +BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../.. endif ifeq ($(BUILD_TYPE),) |