From: Bill Erickson Date: Sun, 20 Nov 2011 23:37:31 +0000 (-0500) Subject: BSD compat changes for 'cp' with a directory X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ef209670ba675ba1e4176aef04ffc091aa16d733;p=working%2FEvergreen.git 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 Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/xul/staff_client/Makefile.am b/Open-ILS/xul/staff_client/Makefile.am index 9556dfe3a5..7ecfa31ad8 100644 --- a/Open-ILS/xul/staff_client/Makefile.am +++ b/Open-ILS/xul/staff_client/Makefile.am @@ -96,8 +96,8 @@ build_dir: @cp application.ini build/ @cp chrome.manifest 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