From: Lucas Stach <dev@lynxeye.de>
Date: Wed, 2 Sep 2015 22:43:16 +0000 (+1000)
Subject: progs: use CURDIR instead of relative paths for header symlinks
X-Git-Tag: v4.2.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a2ea00be01e6c45578ae13b0b7686b5301e3b4;p=thirdparty%2Fxfsprogs-dev.git

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 51ac955b1..6148756e4 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 85c3ed754..ecf1921f7 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)