progs: use make provided CURDIR instead of rolling our own
PATCH 1/1 progs: use make provided CURDIR instead of rolling our own
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 <[email protected]>
--- include/Makefile | 2 +- libxfs/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/Makefile +1 -1
@@ -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)
libxfs/Makefile +1 -1
@@ -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)
Signature · 6 lines
2.1.0 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 3 lines · Lucas Stach
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.
It should actually use TOPDIR to be consistent with the result of the makefiles. i.e. all paths are relative to TOPDIR, not PWD or CURDIR.
Cheers,
Dave.
Signature · 7 lines
Dave Chinner [email protected] _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs