patch provided by A. Pogrebennyk - no build errors when using CI system and not installing default config files

sayer/1.4-spce2.6
Vladimir Broz 13 years ago
parent 792ccb1413
commit 082f06f526

@ -58,16 +58,16 @@ clean:
.PHONY: modules .PHONY: modules
modules: modules:
-@for r in $(app_modules) "" ; do \ @for r in $(app_modules) "" ; do \
if [ -n "$$r" ]; then \ if [ -n "$$r" -a -f "$$r"/Makefile ]; then \
echo "" ; \ echo "" ; \
echo "" ; \ echo "" ; \
COREPATH=../$(COREPATH) $(MAKE) -C $$r all; \ COREPATH=../$(COREPATH) $(MAKE) -C $$r all || exit 1; \
fi ; \ fi ; \
done done
.PHONY: install .PHONY: install
install: install-bin install-cfg install: install-bin
.PHONY: install-bin .PHONY: install-bin
install-bin: install-bin:

@ -41,7 +41,7 @@ modules:
done done
.PHONY: install .PHONY: install
install: install-bin install-cfg install: install-bin
.PHONY: install-bin .PHONY: install-bin
install-bin: install-bin:

@ -33,7 +33,7 @@ modules:
done done
.PHONY: install .PHONY: install
install: install-bin install-cfg install: install-bin
.PHONY: install-bin .PHONY: install-bin
install-bin: install-bin:

@ -33,7 +33,7 @@ modules:
done done
.PHONY: install .PHONY: install
install: install-bin install-cfg install: install-bin
.PHONY: install-bin .PHONY: install-bin
install-bin: install-bin:

@ -70,8 +70,6 @@ $(NAME): $(NAME).o $(OBJS) ../Makefile.defs
install: all mk-install-dirs \ install: all mk-install-dirs \
install-audio \ install-audio \
install-modules-cfg \
install-cfg \
install-bin \ install-bin \
install-modules install-modules

@ -27,12 +27,12 @@ depends = $(srcs:.cpp=.d)
.PHONY: all .PHONY: all
all: $(extra_target) all: $(extra_target)
-@$(MAKE) deps && \ @$(MAKE) deps && \
$(MAKE) $(lib_full_name) $(MAKE) $(lib_full_name)
.PHONY: module_package .PHONY: module_package
module_package: $(extra_target) module_package: $(extra_target)
-@$(MAKE) deps && \ @$(MAKE) deps && \
$(MAKE) $(lib_name) $(MAKE) $(lib_name)

Loading…
Cancel
Save