BSD compat changes for 'cp' with a directory
authorBill Erickson <berick@esilibrary.com>
Sun, 20 Nov 2011 23:37:31 +0000 (18:37 -0500)
committerJason Stephenson <jstephenson@mvlc.org>
Wed, 17 Oct 2012 16:52:55 +0000 (12:52 -0400)
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 <berick@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Open-ILS/xul/staff_client/Makefile.am

index 9556dfe..7ecfa31 100644 (file)
@@ -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