progs: use CURDIR instead of relative paths for header symlinks

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@lynxeye.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/include/Makefile b/include/Makefile
index 51ac955b14d9a69cbf66e66ced032cd9fbe8b805..6148756e4d36b97b982869747f9fc6ae0618accb 100644 (file)
--- 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 85c3ed7545507369b4aa2bc5d8ff9251a1a78a4d..ecf1921f7a74f10f2ae876bcbfe9896c438b8210 100644 (file)
--- 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)