[PATCH] progs: use make provided CURDIR instead of rolling our own
Lucas Stach
dev at lynxeye.de
Tue Sep 1 13:10:10 CDT 2015
This fixes broken header symlinks when make isn't triggered from the xfsprogs
source location, but as a recursion from another make in a different
directory. This is a common pattern found in cross build systems.
Signed-off-by: Lucas Stach <dev at lynxeye.de>
---
include/Makefile | 2 +-
libxfs/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/Makefile b/include/Makefile
index 51ac955..6148756 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -67,7 +67,7 @@ include $(BUILDRULES)
install-headers: $(addsuffix -hdrs, $(PHFILES) $(DKHFILES) $(HFILES))
%-hdrs:
- $(Q)$(LN_S) -f $(PWD)/include/$* xfs/$*
+ $(Q)$(LN_S) -f $(CURDIR)/$* xfs/$*
install: default
$(INSTALL) -m 755 -d $(PKG_INC_DIR)
diff --git a/libxfs/Makefile b/libxfs/Makefile
index 85c3ed7..ecf1921 100644
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -134,7 +134,7 @@ install: default
install-headers: $(addsuffix -hdrs, $(PKGHFILES))
%-hdrs:
- $(Q)$(LN_S) -f $(PWD)/libxfs/$* $(TOPDIR)/include/xfs/$*
+ $(Q)$(LN_S) -f $(CURDIR)/$* $(TOPDIR)/include/xfs/$*
install-dev: install
$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
--
2.1.0
More information about the xfs
mailing list