From 8089eb26f57fa0c55692d48fa090203cb72e66d3 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Sun, 20 Nov 2011 18:37:31 -0500 Subject: [PATCH] BSD compat changes for 'cp' with a directory When copying an entire directory with 'cp -r', change "cp -r foo/" to "cp -r foo". BSD cp treats "cp -r foo/" like "cp -r foo/*", which copies the contents of foo to the destination directory and not the directory foo itself. Signed-off-by: Bill Erickson --- Open-ILS/xul/staff_client/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index bcd8bd353b..9cb39554af 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -84,8 +84,8 @@ build_dir: @cp -fR components build/ @cp application.ini build/ @if [ -f "install.mccoy.rdf" ]; then cp install.mccoy.rdf build/install.rdf; else cp install.rdf build/; fi - @cp -fR build/chrome/content/util/ build/server/ - @cp -fR build/chrome/content/auth/ build/server/ + @cp -fR build/chrome/content/util build/server/ + @cp -fR build/chrome/content/auth build/server/ @cp build/chrome/content/main/constants.js build/server/main/constants.js @cp build/chrome/content/main/bindings.xml build/server/main/bindings.xml @cp build/chrome/content/OpenILS/data.js build/server/OpenILS/data.js -- 2.11.0