From 120717c6ec1bd64dbf5606fe1edcc207aebcc560 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 11 Apr 2008 19:16:16 +0000 Subject: [PATCH] * Fixing Makefiles --- core/Makefile | 4 ++-- module/admin-core/Makefile | 14 ++++++-------- module/public-core/Makefile | 13 ++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/core/Makefile b/core/Makefile index 7db8ddb4a..458396357 100644 --- a/core/Makefile +++ b/core/Makefile @@ -21,8 +21,8 @@ all: compile depends: mkdir -p $(OUTDIRS) - for i in $(CPFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i); done + for i in $(CPFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done compile: depends $(LUAC) $(LUAC_OPTIONS) -o dist/$(OUTFILE) $(INFILES) diff --git a/module/admin-core/Makefile b/module/admin-core/Makefile index 9b5745139..84c2277dd 100644 --- a/module/admin-core/Makefile +++ b/module/admin-core/Makefile @@ -16,20 +16,18 @@ CPFILES = $(FILES:%=src/%) all: compile - depends: mkdir -p $(OUTDIRS) - for i in $(CPFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i); done + for i in $(CPFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done compile: depends - for i in $(INFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i); done + for i in $(INFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done - source: depends - for i in $(INFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i); done + for i in $(INFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done clean: diff --git a/module/public-core/Makefile b/module/public-core/Makefile index 9b5745139..a4ac9fc0e 100644 --- a/module/public-core/Makefile +++ b/module/public-core/Makefile @@ -19,17 +19,16 @@ all: compile depends: mkdir -p $(OUTDIRS) - for i in $(CPFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i); done + for i in $(CPFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done compile: depends - for i in $(INFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i); done + for i in $(INFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); $(LUAC) $(LUAC_OPTIONS) -o dist/$$i src/$$i; fi; done - source: depends - for i in $(INFILES); do [ -f "$$i" ] && (i=$$(echo $$i | cut -d/ -f2-); \ - mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i); done + for i in $(INFILES); do if [ -f "$i" ]; then i=$$(echo $$i | cut -d/ -f2-); \ + mkdir -p dist/$$(dirname $$i); cp src/$$i dist/$$i; fi; done clean: -- 2.25.1