Changeset 3236

Timestamp:

12/20/11 13:30:53 (5 months ago)

Author:

erkn

Message:

fix for install to non-stadard location bug (#52)

As the mx_ scripts are based on mc_.pl code a fix is to check for
m[xc] instead.

The Makefile.in is changed so that the MCSTAS variable is actually used
as intended. Otherwise is was just set in its own subshell

Location:

branches/mcxtrace-1.0/src

Files:

• Makefile.in (modified) (2 diffs)
• mcdaemon.pl (modified) (1 diff)
• mcdisplay.pl (modified) (1 diff)
• mcdoc.pl (modified) (1 diff)
• mcformatgui.pl (modified) (1 diff)
• mcplot.pl (modified) (1 diff)
• mcresplot.pl (modified) (1 diff)
• mcrun.pl (modified) (1 diff)
• mxgui.pl (modified) (1 diff)

branches/mcxtrace-1.0/src/Makefile.in

@@ -192 +192 @@
         cd $(topdir)/nlib && $(MAKE) install
         @echo "Create component documentation..."
-        export MCSTAS=$(libdir_mccode)
-        $(topdir)/src/mcdoc.fixpl --text; 
+        MCSTAS=$(libdir_mccode) $(topdir)/src/mcdoc.fixpl --text; 
 
 # documentation with mxdoc is broken, as it uses MCSTAS location and env
@@ -211 +210 @@
         cd $(topdir)/xlib && $(MAKE) install 
         @echo "Create component documentation..."
-        export MCSTAS=$(libdir_mccode)
-        $(topdir)/src/mxdoc.mxfixpl --text; 
+        MCSTAS=$(libdir_mccode) $(topdir)/src/mxdoc.mxfixpl --text; 
 
 installdirs:

branches/mcxtrace-1.0/src/mcdaemon.pl

@@ -40 +40 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcdaemon/i) {
+    if ($0 =~ /m[cx]daemon/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mcdisplay.pl

@@ -45 +45 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcdisplay/i) {
+    if ($0 =~ /m[xc]display/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mcdoc.pl

@@ -12 +12 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcdoc/i) {
+    if ($0 =~ /m[cx]doc/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mcformatgui.pl

@@ -41 +41 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcformatgui/i) {
+    if ($0 =~ /m[xc]formatgui/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mcplot.pl

@@ -35 +35 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcplot/i) {
+    if ($0 =~ /m[xc]plot/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mcresplot.pl

@@ -38 +38 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcresplot/i) {
+    if ($0 =~ /m[xc]resplot/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mcrun.pl

@@ -34 +34 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcrun/i) {
+    if ($0 =~ /m[xc]run/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";

branches/mcxtrace-1.0/src/mxgui.pl

@@ -36 +36 @@
     $MCSTAS::sys_dir = $ENV{"MCSTAS"};
   } else {
-    if ($0 =~ /mcgui/i) {
+    if ($0 =~ /mxgui/i) {
       if ($Config{'osname'} eq 'MSWin32') {
         $MCSTAS::sys_dir = "c:\\mcstas\\lib";