[PD-cvs] pd/src Makefile.am,1.1.4.2,1.1.4.3 u_main.tk,1.4.4.1,1.4.4.2

[Tim Blechmann]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13481/src

Modified Files:
      Tag: devel_0_38
	Makefile.am u_main.tk 
Log Message:
build system and hcs's pd.tk fix

Index: Makefile.am
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/Makefile.am,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -d -r1.1.4.2 -r1.1.4.3
*** Makefile.am	6 Nov 2004 13:58:13 -0000	1.1.4.2
--- Makefile.am	7 Nov 2004 12:38:56 -0000	1.1.4.3
***************
*** 108,114 ****
  all-local: bin/pd.tk
  
! bin/pd.tk: 
! 	echo set pd_nt @OSNUMBER@ > bin/pd.tk
! 	grep -v "set pd_nt" < u_main.tk >> bin/pd.tk
  
  install-exec-local: 
--- 108,113 ----
  all-local: bin/pd.tk
  
! bin/pd.tk: u_main.tk
! 	install u_main.tk ./bin/pd.tk
  
  install-exec-local: 

Index: u_main.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -d -r1.4.4.1 -r1.4.4.2
*** u_main.tk	5 Nov 2004 14:27:47 -0000	1.4.4.1
--- u_main.tk	7 Nov 2004 12:38:56 -0000	1.4.4.2
***************
*** 1,8 ****
- set pd_nt 1
  #!/usr/bin/wish
  
- # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX.  The first
- # line is automatically munged by the relevant makefiles.)
- 
  # Copyright (c) 1997-1999 Miller Puckette.
  # For information on usage and redistribution, and for a DISCLAIMER OF ALL
--- 1,4 ----
***************
*** 17,20 ****
--- 13,32 ----
  # all this changes are labeled with #######iemlib##########
  
+ 
+ if { $tcl_platform(platform) == "windows" }  {
+ 	 set pd_nt 1
+ 	 puts stderr {Configuring for Windows}
+ } elseif {$tcl_platform(os) == "Darwin"} {
+ 	 set pd_nt 2
+ 	 puts stderr {Configuring for MacOS X}
+ } else {
+ 	 set pd_nt 0	 
+ 	 puts stderr {Configuring for UNIX}
+ }
+ 
+ # (The above is 0 for unix, 1 for microsoft, and 2 for Mac OSX.  The first
+ # line is automatically munged by the relevant makefiles.)
+ 
+ 
  # Tearoff is set to true by default:
  set pd_tearoff 1