[Firebird-checkins] CVS: interbase/builds/original prefix.freebsd,1.2,1.3

[Geoffrey C. S. <gsp...@us...>]

Update of /cvsroot/firebird/interbase/builds/original
In directory usw-pr-cvs1:/tmp/cvs-serv18232/builds/original

Modified Files:
	prefix.freebsd 
Log Message:
- The original version of this file assumed Interbase was installed
  and running already.  This one doesn't, so that it works with the
  boot build.


Index: prefix.freebsd
===================================================================
RCS file: /cvsroot/firebird/interbase/builds/original/prefix.freebsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** prefix.freebsd	2000/10/08 15:36:25	1.2
--- prefix.freebsd	2001/01/12 18:18:13	1.3
***************
*** 29,33 ****
  
  PROD_DEBUG_OBJECTS=	nodebug.o
! PROD_SHRLIB_DIR=	
  PROD_VERSION_FLAG=	-DPROD_BUILD
  PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
--- 29,33 ----
  
  PROD_DEBUG_OBJECTS=	nodebug.o
! PROD_SHRLIB_DIR=	-Lsource/jrd
  PROD_VERSION_FLAG=	-DPROD_BUILD
  PROD_CFLAGS=            -O -m486 -fpic -DFLINTSTONE
***************
*** 49,53 ****
  UDF_CFLAGS=         	-fPIC -mieee-fp
  UDF_LFLAGS=         	-shared
! UDF_SHRLIBS=        	-L/usr/local/lib -lgds -lm -lc -mieee-fp -ldescrypt
  
  #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
--- 49,53 ----
  UDF_CFLAGS=         	-fPIC -mieee-fp
  UDF_LFLAGS=         	-shared
! UDF_SHRLIBS=        	$(SHRLIB_DIR) -lgds -lm -lc -mieee-fp -ldescrypt
  
  #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules
***************
*** 70,74 ****
  FUNCSHR=		source/interbase/lib/gdsf.so
  GDS_LINK=		$(GDSSHR_LINK)
- #GDS_PYXIS=
  GDS_PYXIS=		gds_pyxis.a
  GDSLIB_BACKEND=		source/interbase/lib/gds_b.a
--- 70,73 ----
***************
*** 77,83 ****
  GDSSHR=			source/interbase/lib/gds.so
  LINUX_GDSSHR=		$(GDSSHR)
! GDSSHR_LINK=		$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis -ldescrypt
! PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -L/usr/local/lib -lgds -lgds_pyxis
! #PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
  HLPDIR=			source/qli/
  HOSTNAME=		`hostname | cut -d'.' -f1`
--- 76,81 ----
  GDSSHR=			source/interbase/lib/gds.so
  LINUX_GDSSHR=		$(GDSSHR)
! GDSSHR_LINK=		$(SHRLIB_DIR) -lgds -lgds_pyxis -ldescrypt
! PIPE_GDSSHR_LINK=	$(SHRLIB_DIR) -lgds -lgds_pyxis
  HLPDIR=			source/qli/
  HOSTNAME=		`hostname | cut -d'.' -f1`
***************
*** 107,115 ****
  PIC_FLAGS=		$(CFLAGS) -fPIC
  PIPE=			gds.a gds_pipe
- #PYXIS=
- #PYXIS_MISC_OBJS=
- #PYXIS_P_MISC_OBJS=
- #PYXIS_OBJECTS=
- #PYXIS_MISC_OBJECTS=
  PYXIS=			pyxis
  PYXIS_MISC_OBJS=	$(PYXIS_MISC)
--- 105,108 ----
***************
*** 168,171 ****
--- 161,167 ----
  
  V3PRINTER=		source/lock/printv3.o
+ 
+ # Forces library build for FreeBSD
+ PYXIS_LIBRARY= libpyxis.a
  
  #   End of file prefix.freebsd:	$(VERSION)	$(PLATFORM)