diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-09-17 23:57:08 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-09-23 00:03:10 +0200 |
| commit | 42b4c28d2034edafecf2a200e546aadb9fd82793 (patch) | |
| tree | 016596bc1e7533598a3ab2350159f529edf23c4b /templates | |
| parent | 1965810ede1dae0aaf72d55e1359e640d08720f8 (diff) | |
Fixing usage of the BUILDDIR variable.
Now both using absolute and relative directory for that variable should work.
BUILDDIR=/tmp/build-grpc make
BUILDDIR=../build-grpc make
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 6069d6d238..49c2f8b7f5 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -65,8 +65,11 @@ endif + MAKEFILE_PATH = $(abspath $(lastword $(MAKEFILE_LIST))) ifndef BUILDDIR - BUILDDIR = . + BUILDDIR_ABSOLUTE = $(patsubst %/,%,$(dir $(MAKEFILE_PATH))) + else + BUILDDIR_ABSOLUTE = $(abspath $(BUILDDIR)) endif HAS_GCC = $(shell which gcc > /dev/null 2> /dev/null && echo true || echo false) @@ -92,10 +95,10 @@ endif - BINDIR = $(BUILDDIR)/bins - OBJDIR = $(BUILDDIR)/objs - LIBDIR = $(BUILDDIR)/libs - GENDIR = $(BUILDDIR)/gens + BINDIR = $(BUILDDIR_ABSOLUTE)/bins + OBJDIR = $(BUILDDIR_ABSOLUTE)/objs + LIBDIR = $(BUILDDIR_ABSOLUTE)/libs + GENDIR = $(BUILDDIR_ABSOLUTE)/gens # Configurations @@ -1599,13 +1602,13 @@ $(Q) $(AR) rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(LIB${lib.name.upper()}_OBJS) % if lib.get('baselib', False): % if lib.get('secure', 'check') == True: - $(Q) rm -rf tmp-merge-${lib.name} - $(Q) mkdir tmp-merge-${lib.name} - $(Q) ( cd tmp-merge-${lib.name} ; $(AR) x ../$(LIBDIR)/$(CONFIG)/lib${lib.name}.a ) - $(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd tmp-merge-${lib.name} ; <%text>ar x ../$${l}</%text> ) ; done - $(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/__.SYMDEF* - $(Q) ar rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a tmp-merge-${lib.name}/* - $(Q) rm -rf tmp-merge-${lib.name} + $(Q) rm -rf $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} + $(Q) mkdir $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} + $(Q) ( cd $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} ; $(AR) x $(LIBDIR)/$(CONFIG)/lib${lib.name}.a ) + $(Q) for l in $(OPENSSL_MERGE_LIBS) ; do ( cd $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} ; <%text>ar x $${l}</%text> ) ; done + $(Q) rm -f $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}/__.SYMDEF* + $(Q) ar rcs $(LIBDIR)/$(CONFIG)/lib${lib.name}.a $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name}/* + $(Q) rm -rf $(BUILDDIR_ABSOLUTE)/tmp-merge-${lib.name} % endif % endif ifeq ($(SYSTEM),Darwin) |