From: Lucas Stach <dev@lynxeye.de>
To: Dave Chinner <david@fromorbit.com>
Cc: xfs@oss.sgi.com
Subject: [PATCH] progs: use make provided CURDIR instead of rolling our own
Date: Tue, 1 Sep 2015 20:10:10 +0200 [thread overview]
Message-ID: <1441131010-5439-1-git-send-email-dev@lynxeye.de> (raw)
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
next reply other threads:[~2015-09-01 18:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-01 18:10 Lucas Stach [this message]
2015-09-01 20:04 ` [PATCH] progs: use make provided CURDIR instead of rolling our own Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441131010-5439-1-git-send-email-dev@lynxeye.de \
--to=dev@lynxeye.de \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox