diff options
| author | Jeff Epler <jepler@unpythonic.net> | 2012-01-18 12:20:08 -0600 |
|---|---|---|
| committer | Jeff Epler <jepler@unpythonic.net> | 2012-01-18 13:20:34 -0600 |
| commit | 33cfebe5a1b740cf949b2379dd7379a9e93a5fce (patch) | |
| tree | b03738d347d1b04871f1ab7a094d109ac6082d06 | |
| parent | da32a1cab7f1efc5493cabc73191fbab45bb3220 (diff) | |
| download | linuxcnc-33cfebe5a1b740cf949b2379dd7379a9e93a5fce.tar.gz linuxcnc-33cfebe5a1b740cf949b2379dd7379a9e93a5fce.zip | |
rename more files to linuxcnc
| -rw-r--r-- | configs/common/linuxcnc.nml (renamed from configs/common/emc.nml) | 0 | ||||
| -rw-r--r-- | docs/help/xlinuxcnc.txt (renamed from docs/help/xemc.txt) | 0 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile.inc.in | 8 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/emc/usr_intf/axis/Submakefile | 2 | ||||
| -rw-r--r-- | src/emc/usr_intf/axis/scripts/linuxcnctop.py (renamed from src/emc/usr_intf/axis/scripts/emctop.py) | 0 | ||||
| -rw-r--r-- | src/emc/usr_intf/pncconf/Submakefile | 4 | ||||
| -rw-r--r-- | src/emc/usr_intf/touchy/Submakefile | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/configs/common/emc.nml b/configs/common/linuxcnc.nml index 3b3d72b0f..3b3d72b0f 100644 --- a/configs/common/emc.nml +++ b/configs/common/linuxcnc.nml diff --git a/docs/help/xemc.txt b/docs/help/xlinuxcnc.txt index 24df42a9d..24df42a9d 100644 --- a/docs/help/xemc.txt +++ b/docs/help/xlinuxcnc.txt diff --git a/src/Makefile b/src/Makefile index 3a2d6a982..a4c81b3cc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -532,7 +532,7 @@ endif $(FILE) ../tcl/linuxcnc.so $(DESTDIR)$(tcldir) $(FILE) ../tcl/pkgIndex.tcl $(DESTDIR)$(tcldir) $(EXE) $(TCL_BIN) $(DESTDIR)$(tcldir)/bin - $(FILE) ../tcl/scripts/balloon.tcl ../tcl/scripts/linuxcnchelp.tcl $(DESTDIR)$(tcldir)/scripts + $(FILE) ../tcl/scripts/balloon.tcl ../tcl/scripts/emchelp.tcl $(DESTDIR)$(tcldir)/scripts $(EXE) ../tcl/scripts/Set_Coordinates.tcl $(DESTDIR)$(tcldir)/scripts $(FILE) ../share/linuxcnc/stepconf.glade $(DESTDIR)$(prefix)/share/linuxcnc $(FILE) ../share/linuxcnc/touchy.glade $(DESTDIR)$(prefix)/share/linuxcnc diff --git a/src/Makefile.inc.in b/src/Makefile.inc.in index 1bf4e9514..3249335d9 100644 --- a/src/Makefile.inc.in +++ b/src/Makefile.inc.in @@ -61,10 +61,10 @@ LANGUAGES = @LANGUAGES@ #still needs discussion # do we really need these? initd_dir = /etc/init.d -docsdir = ${prefix}/share/doc/emc2 -sampleconfsdir = ${prefix}/share/doc/emc2/examples/sample-configs -ncfilesdir = ${prefix}/share/emc/ncfiles -tcldir = ${prefix}/lib/tcltk/emc2 +docsdir = ${prefix}/share/doc/linuxcnc +sampleconfsdir = ${prefix}/share/doc/linuxcnc/examples/sample-configs +ncfilesdir = ${prefix}/share/linuxcnc/ncfiles +tcldir = ${prefix}/lib/tcltk/linuxcnc # /Standard configure directories diff --git a/src/configure.in b/src/configure.in index 6b34402a1..a6f8330b9 100644 --- a/src/configure.in +++ b/src/configure.in @@ -472,13 +472,13 @@ if test "$RUN_IN_PLACE" = "yes"; then RIP_MODULE_DIR="${BUILD_TOPLEVEL}/rtlib" AC_MSG_RESULT([configuring for run-in-place]) prefix=${BUILD_TOPLEVEL} - DEFAULT_NMLFILE=${prefix}/configs/common/emc.nml + DEFAULT_NMLFILE=${prefix}/configs/common/linuxcnc.nml DEFAULT_TOOLTABLE=${prefix}/configs/sim/sim.tbl AC_MSG_RESULT([$RIP_MODULE_DIR]) else RUN_IN_PLACE=no EMC2_HOME=$prefix - DEFAULT_NMLFILE=${prefix}/share/emc/emc.nml + DEFAULT_NMLFILE=${prefix}/share/emc/linuxcnc.nml AC_MSG_RESULT([$MODULE_DIR]) fi diff --git a/src/emc/usr_intf/axis/Submakefile b/src/emc/usr_intf/axis/Submakefile index 81e35e6e2..23532068f 100644 --- a/src/emc/usr_intf/axis/Submakefile +++ b/src/emc/usr_intf/axis/Submakefile @@ -33,7 +33,7 @@ $(TOGLMODULE): $(call TOOBJS, $(TOGLMODULESRCS)) PYTARGETS += $(EMCMODULE) $(MINIGLMODULE) $(SETICONMODULE) $(TOGLMODULE) -PYSCRIPTS := axis.py axis-remote.py emctop.py hal_manualtoolchange.py \ +PYSCRIPTS := axis.py axis-remote.py linuxcnctop.py hal_manualtoolchange.py \ mdi.py image-to-gcode.py lintini.py debuglevel.py teach-in.py tracking-test.py PYBIN := $(patsubst %.py,../bin/%,$(PYSCRIPTS)) PYTARGETS += $(PYBIN) diff --git a/src/emc/usr_intf/axis/scripts/emctop.py b/src/emc/usr_intf/axis/scripts/linuxcnctop.py index 2e13eb7c6..2e13eb7c6 100644 --- a/src/emc/usr_intf/axis/scripts/emctop.py +++ b/src/emc/usr_intf/axis/scripts/linuxcnctop.py diff --git a/src/emc/usr_intf/pncconf/Submakefile b/src/emc/usr_intf/pncconf/Submakefile index 21ab7195b..9fc278483 100644 --- a/src/emc/usr_intf/pncconf/Submakefile +++ b/src/emc/usr_intf/pncconf/Submakefile @@ -4,9 +4,9 @@ $(ECHO) Copying python script $(notdir $@) $(Q)(echo '#!$(PYTHON)'; sed '1 { /^#!/d; }' $<) > $@.tmp && chmod +x $@.tmp && mv -f $@.tmp $@ -../share/emc/pncconf.glade: emc/usr_intf/pncconf/pncconf.glade +../share/linuxcnc/pncconf.glade: emc/usr_intf/pncconf/pncconf.glade mkdir -p ../share/emc/ cp -f $< $@ -PYTARGETS += ../bin/pncconf ../share/emc/pncconf.glade +PYTARGETS += ../bin/pncconf ../share/linuxcnc/pncconf.glade PYI18NSRCS += emc/usr_intf/pncconf/pncconf.py emc/usr_intf/pncconf/pncconf.glade diff --git a/src/emc/usr_intf/touchy/Submakefile b/src/emc/usr_intf/touchy/Submakefile index 801317b92..c4e1a0aab 100644 --- a/src/emc/usr_intf/touchy/Submakefile +++ b/src/emc/usr_intf/touchy/Submakefile @@ -1,7 +1,7 @@ TOUCHY_MODULES = mdi emc_interface hal_interface filechooser listing preferences PYTARGETS += ../bin/touchy ../lib/python/touchy/__init__.py $(patsubst %,../lib/python/touchy/%.py,$(TOUCHY_MODULES)) \ - ../share/emc/touchy.glade + ../share/linuxcnc/touchy.glade PYI18NSRCS += emc/usr_intf/touchy/touchy.py $(patsubst %,emc/usr_intf/touchy/%.py,$(TOUCHY_MODULES)) \ emc/usr_intf/touchy/touchy.glade @@ -16,7 +16,7 @@ PYI18NSRCS += emc/usr_intf/touchy/touchy.py $(patsubst %,emc/usr_intf/touchy/%.p $(Q)mkdir -p ../lib/python/touchy $(Q)cp $< $@ -../share/emc/touchy.glade: emc/usr_intf/touchy/touchy.glade +../share/linuxcnc/touchy.glade: emc/usr_intf/touchy/touchy.glade $(ECHO) Copying glade file $(notdir $@) $(Q)mkdir -p $(dir $@) $(Q)cp -f $< $@ |