From bff69d359300b95e2b1701776401bef7c375b949 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 6 Feb 2015 01:39:00 +0100 Subject: [PATCH] Re-generated the Makefiles --- Makefile | 6 +++++- doc/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8803507..5fb8471 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,11 @@ MKDIR = mkdir -m 0755 -p all: subdirs subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && \ + if [ -n "$(OBJDIR)" ]; then \ + ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ + $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ + else $(MAKE); fi) || exit; done clean: @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done diff --git a/doc/Makefile b/doc/Makefile index a025ee3..9c32dce 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -12,7 +12,11 @@ INSTALL = install all: subdirs $(TARGETS) subdirs: - @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done + @for i in $(SUBDIRS); do (cd "$$i" && \ + if [ -n "$(OBJDIR)" ]; then \ + ([ -d "$(OBJDIR)$$i" ] || $(MKDIR) -- "$(OBJDIR)$$i") && \ + $(MAKE) OBJDIR="$(OBJDIR)$$i/"; \ + else $(MAKE); fi) || exit; done $(OBJDIR)configure.1: configure.xml ./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)configure.1"