diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-29 10:32:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-29 10:32:51 +0200 |
| commit | a375d178f6abdfa51e28cb76af67ec5d77490afb (patch) | |
| tree | 3780e5b53992fbd1d2adec88b32de483ee65de53 | |
| parent | ecd335fa61551d0b86d3f075469a7743ab899d95 (diff) | |
| parent | 2f2a5a920dd2446d93f965fd9de9c7e4fd172ecf (diff) | |
| download | nx-libs-a375d178f6abdfa51e28cb76af67ec5d77490afb.tar.gz nx-libs-a375d178f6abdfa51e28cb76af67ec5d77490afb.tar.bz2 nx-libs-a375d178f6abdfa51e28cb76af67ec5d77490afb.zip | |
Merge branch 'sunweaver-pr/build-includes-robustness' into 3.6.x
Attributes GH PR #247: https://github.com/ArcticaProject/nx-libs/pull/247
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Fri, 28 Oct 2016 15:29:43 -0700
| -rw-r--r-- | nx-X11/config/cf/Imake.rules | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |