Changeset 3221

Timestamp:

12/13/11 12:34:04 (5 months ago)

Author:

erkn

Message:

fixed perl bug in install targets and mcdoc

MCSTAS was set in inistall targets but mcdoc was run in its own
subshell without it. The fallback solution in mcdoc was
broken for mxdoc (mcxtrace) in that it checked $0 against mcdoc
hardcoded. Now both places are fixed.

Location:

trunk/src

Files:

• Makefile.in (modified) (2 diffs)
• mcdoc.pl (modified) (1 diff)

trunk/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:

trunk/src/mcdoc.pl

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