Menu
▾
▴
[Emc-commit] emc2/src Makefile, 1.198, 1.199 configure, 1.123, 1.124 configure.in, 1.125, 1.126
|
From: Jeff E. <cv...@cv...> - 2007-01-31 22:54:13
|
Modified file emc2/src/Makefile Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/Makefile?rev=1.199> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/Makefile.diff?r1=1.198;r2=1.199> Branch: TRUNK Log: revision 1.199 date: 2007/01/31 22:54:04; author: jepler; state: Exp; lines: +1 -1 fix SF#1648395 (http://sourceforge.net/tracker/index.php?func=detail&aid=1648395&group_id=6744&atid=106744): make EMC_HOME and prefix be the same thing, and use @prefix@ in nf.py to find the files such as accel.tcl --- Makefile 2007/01/26 20:25:06 1.198 +++ Makefile 2007/01/31 22:54:04 1.199 @@ -167,7 +167,7 @@ ../docs/man/man1/emc.1 ../scripts/emc ../scripts/realtime \ ../scripts/rtapi.conf Makefile.inc depend.sh Makefile.modinc \ ../tcl/emc.tcl ../scripts/halrun ../scripts/emc-environment \ - ../scripts/emcmkdesktop + ../scripts/emcmkdesktop ../lib/python/nf.py $(INFILES): %: %.in config.status @./config.status --file=$@ Modified file emc2/src/configure Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/configure?rev=1.124> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/configure.diff?r1=1.123;r2=1.124> Branch: TRUNK Log: revision 1.124 date: 2007/01/31 22:54:04; author: jepler; state: Exp; lines: +5 -0 fix SF#1648395 (http://sourceforge.net/tracker/index.php?func=detail&aid=1648395&group_id=6744&atid=106744): make EMC_HOME and prefix be the same thing, and use @prefix@ in nf.py to find the files such as accel.tcl --- configure 2007/01/17 23:44:03 1.123 +++ configure 2007/01/31 22:54:04 1.124 @@ -3333,9 +3333,11 @@ RUN_IN_PLACE=yes echo "$as_me:$LINENO: result: configuring for run-in-place" >&5 echo "${ECHO_T}configuring for run-in-place" >&6 + prefix=${BUILD_TOPLEVEL} ;; *) RUN_IN_PLACE=no + EMC2_HOME=$prefix ;; esac @@ -9738,6 +9740,8 @@ ac_config_files="$ac_config_files ../tcl/emc.tcl" + ac_config_files="$ac_config_files ../lib/python/nf.py" + ac_config_files="$ac_config_files ../scripts/emcmkdesktop" cat >confcache <<\_ACEOF @@ -10274,6 +10278,7 @@ "Makefile.modinc" ) CONFIG_FILES="$CONFIG_FILES Makefile.modinc" ;; "depend.sh" ) CONFIG_FILES="$CONFIG_FILES depend.sh" ;; "../tcl/emc.tcl" ) CONFIG_FILES="$CONFIG_FILES ../tcl/emc.tcl" ;; + "../lib/python/nf.py" ) CONFIG_FILES="$CONFIG_FILES ../lib/python/nf.py" ;; "../scripts/emcmkdesktop" ) CONFIG_FILES="$CONFIG_FILES ../scripts/emcmkdesktop" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 Modified file emc2/src/configure.in Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/configure.in?rev=1.126> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/configure.in.diff?r1=1.125;r2=1.126> Branch: TRUNK Log: revision 1.126 date: 2007/01/31 22:54:05; author: jepler; state: Exp; lines: +5 -2 fix SF#1648395 (http://sourceforge.net/tracker/index.php?func=detail&aid=1648395&group_id=6744&atid=106744): make EMC_HOME and prefix be the same thing, and use @prefix@ in nf.py to find the files such as accel.tcl --- configure.in 2007/01/17 23:44:04 1.125 +++ configure.in 2007/01/31 22:54:05 1.126 @@ -13,9 +13,9 @@ # Copyright (c) 2004 All rights reserved. # # Last change: -# $Revision: 1.125 $ +# $Revision: 1.126 $ # $Author: jepler $ -# $Date: 2007/01/17 23:44:04 $ +# $Date: 2007/01/31 22:54:05 $ # This file is released under GPL, refer to docs/README for details # # This file is adapted to replace the old ./configure script @@ -513,9 +513,11 @@ RIP_MODULE_DIR="${BUILD_TOPLEVEL}/rtlib" RUN_IN_PLACE=yes AC_MSG_RESULT([configuring for run-in-place]) + prefix=${BUILD_TOPLEVEL} ;; *) RUN_IN_PLACE=no + EMC2_HOME=$prefix ;; esac ], @@ -1337,6 +1339,7 @@ AC_CONFIG_FILES(Makefile.modinc) AC_CONFIG_FILES(depend.sh) AC_CONFIG_FILES(../tcl/emc.tcl) +AC_CONFIG_FILES(../lib/python/nf.py) AC_CONFIG_FILES([../scripts/emcmkdesktop], [chmod +x ../scripts/emcmkdesktop]) AC_OUTPUT() |