From 590d5f1887abf2246792e49465486083d01b479a Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 21 Aug 2006 06:10:10 +0000 Subject: [PATCH 1/1] Fix symlink detection in userspace Makefiles Merge of master-melb:xfs-cmds:26825a by kenmcd. --- include/buildmacros | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/buildmacros b/include/buildmacros index c189983b..b2559efc 100644 --- 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); \ - test "$(PKG_DISTRIBUTION)" = debian || \ ../$(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 \ - 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.30.2