Fix symlink detection in userspace Makefiles

Merge of master-melb:xfs-cmds:26823a by kenmcd.

diff --git a/doc/CHANGES b/doc/CHANGES
index 47a8ef28d88d757edee92ffc24c528bcb6c54de4..4771a97c425d172e82935a3efe8fa4f60f269779 100644 (file)
--- 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 0c81aaaaa151edc47dfd124d55c44ff11cae4c1a..b2559efcb803748777df82eb2e9bcc7a917946a0 100644 (file)
--- 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