diff options
| author |  Rogan Creswick <creswick@gmail.com> | 2013-06-25 10:44:43 -0700 |
|---|---|---|
| committer | Rogan Creswick <creswick@gmail.com> | 2013-06-25 10:44:43 -0700 |
| commit | e166ed04bfe336f9e6340f7df1a50264f7d64622 (patch) | |
| tree | b2be288c69240e444ec70ece945f0ec59e667690 /mk/util.mk | |
| parent | 750bb02df87cb2731ee593b3206f1ac442fcd69d (diff) | |
| parent | 50e042c8981608e4121f94faec138db0c3e294e3 (diff) | |
Merge branch 'master' of https://github.com/GaloisInc/FiveUI
Diffstat (limited to 'mk/util.mk')
| -rw-r--r-- | mk/util.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -14,7 +14,7 @@ cmd = @$(echo-cmd) $(cmd_$1) label = $(if $(Q),$(Q)echo ' $1';) -find-cmd = $(shell which $1 2$(redir)) +find-cmd = $(shell which $1 2>/dev/null) drop-prefix = $(patsubst $(topdir)/%,%,$1) @@ -23,7 +23,7 @@ quiet_cmd_mkdir = MKDIR $(call drop-prefix,$@) cmd_mkdir = mkdir -p $@ quiet_cmd_copydir = CPDIR $(call drop-prefix,$@) - cmd_copydir = cp -r $(DIR) $@ + cmd_copydir = cp -r $(DIR) $(dir $@) quiet_cmd_cp = CP $(call drop-prefix,$@) cmd_cp = cp $< $@ |