Fix symlink detection in userspace Makefiles

[xfstests-dev.git] / include / buildmacros

diff --git a/include/buildmacros b/include/buildmacros
index c189983bb58590013122ff7943021a2e4b364fc2..b2559efcb803748777df82eb2e9bcc7a917946a0 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -56,7 +56,6 @@ INSTALL_LTLIB = \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
        ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
        ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \

-       test "$(PKG_DISTRIBUTION)" = debian || \

        ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 
        ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif
 


@@ -144,10 +143,12 @@ DIST_MAKERULE = \
 SOURCE_MAKERULE = \
        @test -z "$$DIR" && DIR="."; \
        for f in $(SRCFILES) ""; do \
 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; \
        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
                $(MAKEF) DIR=$$DIR/$$d -C $$d $@ || exit $$?; \
            fi; \
        done