*** test/Makefile.arch.orig	Fri Jun 10 20:12:55 2005
--- test/Makefile.arch	Sat Jul  9 19:49:07 2005
***************
*** 9,15 ****
  ARCH         := $(shell root-config --arch)
  PLATFORM     := $(shell root-config --platform)
  
- CXX           =
  ObjSuf        = o
  SrcSuf        = cxx
  ExeSuf        =
--- 9,14 ----
***************
*** 406,415 ****
  
  ifeq ($(ARCH),freebsd4)
  # FreeBSD with glibc
! CXX           = g++
! CXXFLAGS      = -O -pipe -W -Wall -fPIC
! LD            = g++
! LDFLAGS       = -O
  SOFLAGS       = -shared -Wl,-x
  endif
  
--- 405,419 ----
  
  ifeq ($(ARCH),freebsd4)
  # FreeBSD with glibc
! CXXFLAGS     += -W -Wall -fPIC
! LD            = $(CXX)
! SOFLAGS       = -shared -Wl,-x
! endif
! 
! ifeq ($(ARCH),freebsd5)
! # FreeBSD with glibc
! CXXFLAGS     += -W -Wall -fPIC
! LD            = $(CXX)
  SOFLAGS       = -shared -Wl,-x
  endif