From 2f2a5a920dd2446d93f965fd9de9c7e4fd172ecf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 28 Oct 2016 15:19:10 +0200 Subject: Imake.rules: Make BuildIncludes{,Top}() more robust in case people attempt providing path names instead of file names via srclist. Fixes ArcticaProject/nx-libs#223. Fixes ArcticaProject/nx-libs#244. --- nx-X11/config/cf/Imake.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/config') diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index f782f964b..7fffe5e31 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -569,7 +569,7 @@ install:: @@\ includes:: srclist @@\ MakeDir($(BUILDINCDIR)) @@\ @(set -x; cd $(BUILDINCDIR) && for i in srclist; do \ @@\ - RemoveFile($$i); \ @@\ + RemoveFile(`basename $$i`); \ @@\ $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$$i .; \ @@\ done) #endif /* BuildIncludesTop */ @@ -579,7 +579,7 @@ includes:: srclist @@\ includes:: srclist @@\ MakeDir($(BUILDINCDIR)/dstsubdir) @@\ @(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \ @@\ - RemoveFile($$i); \ @@\ + RemoveFile(`basename $$i`); \ @@\ $(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \ @@\ done) #endif /* BuildIncludes */ -- cgit v1.2.3