public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] progs: use make provided CURDIR instead of rolling our own
@ 2015-09-01 18:10 Lucas Stach
  2015-09-01 20:04 ` Dave Chinner
  0 siblings, 1 reply; 2+ messages in thread
From: Lucas Stach @ 2015-09-01 18:10 UTC (permalink / raw)
  To: Dave Chinner; +Cc: xfs

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>
---
 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

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-09-01 20:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-01 18:10 [PATCH] progs: use make provided CURDIR instead of rolling our own Lucas Stach
2015-09-01 20:04 ` Dave Chinner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox