Re-generated the Makefiles

This commit is contained in:
Pierre Pronchery 2015-02-06 01:39:00 +01:00
parent 3c462bd392
commit bff69d3593
2 changed files with 10 additions and 2 deletions

View File

@ -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

View File

@ -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"