[Python-checkins] CVS: python/dist/src/Demo/pysvr Makefile,1.5,1.6

Guido van Rossum gvanrossum@users.sourceforge.net
Wed, 05 Sep 2001 12:51:10 -0700


Update of /cvsroot/python/python/dist/src/Demo/pysvr
In directory usw-pr-cvs1:/tmp/cvs-serv27492

Modified Files:
	Makefile 
Log Message:
Use the build directory by default, and update the version.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/pysvr/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile	2001/06/02 06:16:02	1.5
--- Makefile	2001/09/05 19:51:08	1.6
***************
*** 12,28 ****
  OPT=-g
  
! # Where Python is installed, and which version
! INST=/usr/local
! VER=2.0
  
! # Expressions using the above definitions -- no need to change
  PYVER=python$(VER)
  # Use these defs when compiling against installed Python
! PYC=$(INST)/lib/$(PYVER)/config
! PYINCL=-I$(INST)/include/$(PYVER) -I$(PYC)
! PYLIBS=$(PYC)/lib$(PYVER).a
  # Use these defs when compiling against built Python
! ##PYINCL=-I../../Include -I../../sparc
! ##PYLIBS=../../sparc/lib$(PYVER).a
  
  # Libraries to link with -- very installation dependent
--- 12,31 ----
  OPT=-g
  
! # Which Python version we're using
! VER=2.2
  
! # Expressions using the above definitions
  PYVER=python$(VER)
+ 
  # Use these defs when compiling against installed Python
! ##INST=/usr/local
! ##PYC=$(INST)/lib/$(PYVER)/config
! ##PYINCL=-I$(INST)/include/$(PYVER) -I$(PYC)
! ##PYLIBS=$(PYC)/lib$(PYVER).a
! 
  # Use these defs when compiling against built Python
! PLAT=linux
! PYINCL=-I../../Include -I../../$(PLAT)
! PYLIBS=../../$(PLAT)/lib$(PYVER).a
  
  # Libraries to link with -- very installation dependent