Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-03-08 14:30:34 +00:00
Code Issues Projects Releases Wiki Activity

build system: use POSIX options only for cp

Browse Source 
cp: improve comment
This commit is contained in:
Denis Vlasenko 2008-04-11 10:54:37 +00:00
parent 119f87be2a
commit 80f647c21c
2 changed files with 4 additions and 3 deletions

5
Makefile.custom

@ -47,10 +47,11 @@ ifneq ($(strip $(DO_INSTALL_LIBS)),n)
endif endif
# Not very elegant: copies testsuite to objdir... # Not very elegant: copies testsuite to objdir...
# (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
.PHONY: check .PHONY: check
.PHONY: test .PHONY: test
check test: busybox busybox.links check test: busybox busybox.links
test -d $(objtree)/testsuite || cp -a $(srctree)/testsuite $(objtree) test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
bindir=$(objtree) srcdir=$(srctree)/testsuite \ bindir=$(objtree) srcdir=$(srctree)/testsuite \
$(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)" $(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
@ -58,7 +59,7 @@ check test: busybox busybox.links
release: distclean release: distclean
cd ..; \ cd ..; \
rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \ rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \ cp -pPR busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \ find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
-name .svn \ -name .svn \
-print \ -print \

2
coreutils/cp.c

@ -44,7 +44,7 @@ int cp_main(int argc, char **argv)
// Soft- and hardlinking don't mix // Soft- and hardlinking don't mix
// -P and -d are the same (-P is POSIX, -d is GNU) // -P and -d are the same (-P is POSIX, -d is GNU)
// -r and -R are the same // -r and -R are the same
// -R (and therefore -r) switches on -d (coreutils does this) // -R (and therefore -r) turns on -d (coreutils does this)
// -a = -pdR // -a = -pdR
opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR"; opt_complementary = "-2:l--s:s--l:Pd:rRd:Rd:apdR";
flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL"); flags = getopt32(argv, FILEUTILS_CP_OPTSTR "arPHL");