r2986 - in /1.2: ./ sconstruct -- January 12, 2007 - 04:06

Author: bugman
Date: Fri Jan 12 04:05:31 2007
New Revision: 2986

URL: http://svn.gna.org/viewcvs/relax?rev=2986&view=rev
Log:
Merged revisions 2984 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r2984 | bugman | 2007-01-12 14:01:40 +1100 (Fri, 12 Jan 2007) | 3 lines
  
  Fixed the commented out manual construction targets for the 'binary_dist' 
and 'source_dist' targets.
........

Modified:
    1.2/   (props changed)
    1.2/sconstruct

Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 12 04:05:31 2007
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984

Modified: 1.2/sconstruct
URL: 
http://svn.gna.org/viewcvs/relax/1.2/sconstruct?rev=2986&r1=2985&r2=2986&view=diff
==============================================================================
--- 1.2/sconstruct (original)
+++ 1.2/sconstruct Fri Jan 12 04:05:31 2007
@@ -201,7 +201,7 @@
         binary_dist_env.dummy(target='binary_dist', source=None)
         binary_dist_env.Depends('binary_dist', 'version_check')           # 
First check the program version number.
         binary_dist_env.Depends('binary_dist', self.relax_fit_object)     # 
Compile the C code.
-        #binary_dist_env.Depends('binary_dist', 'user_manual_pdf')         # 
Compile the PDF version of the user manual.
+        binary_dist_env.Depends('binary_dist', 'user_manual_pdf')         # 
Compile the PDF version of the user manual.
         binary_dist_env.Depends('binary_dist', 'manual_clean_nodeps')     # 
Clean up the temporary manual files.
         binary_dist_env.Depends('binary_dist', 'clean_temp')              # 
Then clean up all other temporary files.
         binary_dist_env.Depends('binary_dist', 'package_bin')             # 
Package the binary distribution.
@@ -211,7 +211,7 @@
         source_dist_env = Environment(BUILDERS={'dummy' : 
Builder(action=self.dummy)})
         source_dist_env.dummy(target='source_dist', source=None)
         source_dist_env.Depends('source_dist', 'version_check')           # 
First check the program version number.
-        #source_dist_env.Depends('source_dist', 'user_manual_pdf')         # 
Compile the PDF version of the user manual.
+        source_dist_env.Depends('source_dist', 'user_manual_pdf')         # 
Compile the PDF version of the user manual.
         source_dist_env.Depends('source_dist', 'manual_clean_nodeps')     # 
Clean up the temporary manual files.
         source_dist_env.Depends('source_dist', 'clean')                   # 
Then clean up the sources.
         source_dist_env.Depends('source_dist', 'package_src')             # 
Package the source distribution.