From 1672be9b421f5e2a4847377fa7547f5da396dcd3 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 21 Aug 2006 06:09:21 +0000 Subject: [PATCH] Fix symlink detection in userspace Makefiles Merge of master-melb:xfs-cmds:26823a by kenmcd. --- doc/CHANGES | 1 + include/buildmacros | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES b/doc/CHANGES index 47a8ef28d..4771a97c4 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -4,6 +4,7 @@ xfsprogs-2.8.11 (08 August 2006) device supports it. Mainly for speeding up xfs_repair as libxfs does its own internal metadata buffering now. - Fix warnings from mkfs.xfs on ramdisk devices. + - Fix issues with symbolic link handling in Makefiles. xfsprogs-2.8.10 (02 August 2006) - Fix v2 directory rebuilds in phase6 of xfs_repair. diff --git a/include/buildmacros b/include/buildmacros index 0c81aaaaa..b2559efcb 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -143,10 +143,12 @@ DIST_MAKERULE = \ SOURCE_MAKERULE = \ @test -z "$$DIR" && DIR="."; \ for f in $(SRCFILES) ""; do \ - if test ! -z "$$f"; then $(ECHO) $$DIR/$$f; fi;\ + test -z "$$f" && break; \ + test -L "$$f" || $(ECHO) $$DIR/$$f; \ done; \ - for d in `echo $(SUBDIRS)` ; do \ - if test -d "$$d" -a ! -z "$$d"; then \ + for d in `echo $(SUBDIRS)` ""; do \ + test -z "$$d" && break; \ + if test -d "$$d"; then \ $(MAKEF) DIR=$$DIR/$$d -C $$d $@ || exit $$?; \ fi; \ done -- 2.47.2