I have applied this patch to my local RIP and it works for me, are there any objections to me committing it?

John Thornton

Sebastian Kuzminsky wrote:

The other part of the commit that fails is adding a subdirectory to /nc_files, but that's easy to fix (patch attached).


The failure on the buildbot is here (scroll down to the bottom of the page): http://buildbot.linuxcnc.org/buildbot/builders/deb-hardy-sim-binary-i386/builds/714/steps/shell_4/logs/stdio

>From 968c6f5f65fe0f0f32a6ba5e0aafd2b9c8a7e5c8 Mon Sep 17 00:00:00 2001
From: Sebastian Kuzminsky <s...@highlab.com>
Date: Thu, 9 Jun 2011 01:02:19 -0600
Subject: [PATCH] install the ngcgui subdir of nc_files

---
 src/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 061f8ab..f76789a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -509,7 +509,7 @@ install-kernel-indep: install-dirs
 	$(FILE) $(filter %.h %.hh,$(TARGETS)) $(DESTDIR)$(includedir)/emc2/
 	$(FILE) $(addprefix ../docs/,$(DOCS)) $(DESTDIR)$(docsdir)
 	$(FILE) $(DOCS_HELP) $(DESTDIR)$(docsdir)
-	$(FILE) $(NC_FILES) $(DESTDIR)$(ncfilesdir)
+	$(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir)
 	$(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir)
 	$(FILE) ../tcl/TkEmc $(DESTDIR)/etc/X11/app-defaults
 	$(FILE) ../app-defaults/XEmc $(DESTDIR)/etc/X11/app-defaults
-- 
1.7.0.4

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers

Reply via email to