From 9bdeddf57384eafe7a7000a70a19dd9fa1c2b291 Mon Sep 17 00:00:00 2001
From: Trevor Elliott <trevor@galois.com>
Date: Thu, 16 May 2013 14:57:49 -0700
Subject: Report absolute paths as relative to $(topdir)

---
 contexts/build.mk | 16 +++++++++-------
 doc/build.mk      |  2 +-
 mk/util.mk        |  9 ++++++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/contexts/build.mk b/contexts/build.mk
index 02622c6..e259371 100644
--- a/contexts/build.mk
+++ b/contexts/build.mk
@@ -52,7 +52,7 @@ $(stage-dir)/data/fiveui/images/%: $(fiveui-dir)/images/% \
 # we just concatenate them all together.  This should be fine, as all of the
 # modules we define just provide functions, or register callbacks.
 
-quiet_cmd_compilejs = JSC        $@
+quiet_cmd_compilejs = JSC        $(call drop-prefix,$@)
       cmd_compilejs = cat $^ > $@
 
 # generic background script dependencies
@@ -75,7 +75,7 @@ options-deps := \
 
 css-bundle := $(topdir)/tools/bin/css-bundle.py
 
-quiet_cmd_cssbundle = CSSC       $@
+quiet_cmd_cssbundle = CSSC       $(call drop-prefix,$@)
       cmd_cssbundle = ( cd $(dir $(TARGET)) && \
                         $(css-bundle) $(notdir $(TARGET)) $@ $(redir) )
 
@@ -93,8 +93,10 @@ $(stage-dir)/data/bundled.css:                                      \
 
 chrome-dir := $(path)/chrome
 
-all: $(build-dir)/fiveui.crx
+all: $(topdir)/fiveui.crx
 
+$(topdir)/fiveui.crx: $(build-dir)/fiveui.crx
+	$(call cmd,cp)
 
 # Create the chrome extension
 $(build-dir)/fiveui.crx: $(target-dir)/chrome-background.js                 \
@@ -103,10 +105,10 @@ $(build-dir)/fiveui.crx: $(target-dir)/chrome-background.js                 \
                          $(stage-dir)/data/fiveui/images/fiveui-icon-16.png \
                          $(stage-dir)/data/bundled.css                      \
                        | $(stage-dir)/data/fiveui/images
-	$(call label,MAKECRX    $@) (cd $(build-dir)    \
-	&& $(topdir)/tools/bin/makecrx stage            \
-	       $(topdir)/contexts/chrome/fiveui.pem     \
-	       fiveui                                   \
+	$(call label,MAKECRX    $(call drop-prefix,$@)) ( cd $(build-dir)   \
+	&& $(topdir)/tools/bin/makecrx stage                                \
+	       $(topdir)/contexts/chrome/fiveui.pem                         \
+	       fiveui                                                       \
 	   $(redir) )
 
 
diff --git a/doc/build.mk b/doc/build.mk
index d13a22a..795cf35 100644
--- a/doc/build.mk
+++ b/doc/build.mk
@@ -9,7 +9,7 @@ pandoc     := $(shell which pandoc 2>/dev/null)
 # HTML Generation ##############################################################
 
 # Use pandoc to generate HTML
-quiet_cmd_pandoc = PANDOC     $@
+quiet_cmd_pandoc = PANDOC     $(call drop-prefix,$@)
       cmd_pandoc = $(pandoc) $< -o $@ -s --highlight-style=kate \
                    --template=$(manual-src)/template.html
 
diff --git a/mk/util.mk b/mk/util.mk
index 3b0ea24..cbc3afe 100644
--- a/mk/util.mk
+++ b/mk/util.mk
@@ -15,11 +15,14 @@ cmd      = @$(echo-cmd) $(cmd_$1)
 label    = $(if $(Q),$(Q)echo '  $1';)
 
 
-quiet_cmd_mkdir = MKDIR      $@
+drop-prefix = $(patsubst $(topdir)/%,%,$1)
+
+
+quiet_cmd_mkdir = MKDIR      $(call drop-prefix,$@)
       cmd_mkdir = mkdir -p $@
 
-quiet_cmd_copydir = CPDIR      $@
+quiet_cmd_copydir = CPDIR      $(call drop-prefix,$@)
       cmd_copydir = cp -r $(DIR) $@
 
-quiet_cmd_cp = CP         $@
+quiet_cmd_cp = CP         $(call drop-prefix,$@)
       cmd_cp = cp $< $@
-- 
cgit v1.2.3