From db6f4ca88b914573a7dbe08bac08bcc730b7aa57 Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Mon, 5 Dec 2011 16:25:16 -0500 Subject: [PATCH 1/2] cross-platform sed fix --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index caeca9b41..93685d4eb 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,8 @@ bundle: | $(BUILD_DIR) @cd src; \ cat $(PDF_JS_FILES) > all_files.tmp; \ sed '/PDFJSSCRIPT_INCLUDE_ALL/ r all_files.tmp' pdf.js > ../$(BUILD_TARGET); \ - sed -i '' "s/PDFJSSCRIPT_BUNDLE_VER/`git log --format="%H" -n 1`/" ../$(BUILD_TARGET); \ + sed -i.bak "s/PDFJSSCRIPT_BUNDLE_VER/`git log --format="%H" -n 1`/" ../$(BUILD_TARGET); \ + rm -f ../$(BUILD_TARGET).bak rm -f *.tmp; \ cd .. From a7088602841e76fe4b1cb223a8771b6ed535dd00 Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Mon, 5 Dec 2011 16:30:41 -0500 Subject: [PATCH 2/2] short she --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93685d4eb..0ad2eb09c 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ bundle: | $(BUILD_DIR) @cd src; \ cat $(PDF_JS_FILES) > all_files.tmp; \ sed '/PDFJSSCRIPT_INCLUDE_ALL/ r all_files.tmp' pdf.js > ../$(BUILD_TARGET); \ - sed -i.bak "s/PDFJSSCRIPT_BUNDLE_VER/`git log --format="%H" -n 1`/" ../$(BUILD_TARGET); \ + sed -i.bak "s/PDFJSSCRIPT_BUNDLE_VER/`git log --format="%h" -n 1`/" ../$(BUILD_TARGET); \ rm -f ../$(BUILD_TARGET).bak rm -f *.tmp; \ cd ..