*** config.pro.orig	Mon Nov 17 15:43:31 2003
--- config.pro	Sat Jan 10 10:16:54 2004
***************
*** 8,16 ****
  # Freetype location
  #
  # Path to "ft2build.h" (if not on standard include path)
! INCLUDEPATH += /usr/include/freetype2
  # Path to "libfreetype.so" (if not in a standard library directory)
! #LIBS       += /usr/lib
  # --------------------------------------------------------------------
  #
  # Zlib location
--- 8,16 ----
  # Freetype location
  #
  # Path to "ft2build.h" (if not on standard include path)
! INCLUDEPATH += $${LOCALBASE}/include/freetype2
  # Path to "libfreetype.so" (if not in a standard library directory)
! LIBS       += -L$${LOCALBASE}/lib	   
  # --------------------------------------------------------------------
  #
  # Zlib location
***************
*** 43,49 ****
  #
  #IPEPREFIX  = /usr/local/ipe
  #IPEPREFIX  = /usr
! IPEPREFIX  = /opt/ipe-6.0
  #
  # Where Ipe executables will be installed ('ipe', 'ipe5toxml' etc)
  IPEBINDIR  = $${IPEPREFIX}/bin
--- 43,49 ----
  #
  #IPEPREFIX  = /usr/local/ipe
  #IPEPREFIX  = /usr
! IPEPREFIX  = $${PREFIX}
  #
  # Where Ipe executables will be installed ('ipe', 'ipe5toxml' etc)
  IPEBINDIR  = $${IPEPREFIX}/bin
***************
*** 55,61 ****
  IPEHEADERDIR = $${IPEPREFIX}/include
  #
  # Where Ipelets will be installed:
! IPELETDIR = $${IPEPREFIX}/lib/ipe/$${IPEVERS}/ipelets
  #
  # List of paths where Ipe will search for Ipelets:
  # (Paths are separated by ":" on Windows and ";" on Unix)
--- 55,61 ----
  IPEHEADERDIR = $${IPEPREFIX}/include
  #
  # Where Ipelets will be installed:
! IPELETDIR = $${IPEPREFIX}/libexec/ipe/$${IPEVERS}/ipelets
  #
  # List of paths where Ipe will search for Ipelets:
  # (Paths are separated by ":" on Windows and ";" on Unix)
***************
*** 74,81 ****
  #
  # The HTML browser started to read the on-line Ipe documentation.
  #IPEBROWSER = netscape
! IPEBROWSER = konqueror
  # --------------------------------------------------------------------
  # Standard definitions --- don't change
  CONFIG      += warn_on release
  linux-g++:QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-sign-compare
--- 74,87 ----
  #
  # The HTML browser started to read the on-line Ipe documentation.
  #IPEBROWSER = netscape
! IPEBROWSER = $${WWWBROWSER}
  # --------------------------------------------------------------------
+ # Respect CXX and CC variables
+ QMAKE_CXX=$${CXX}
+ QMAKE_CC=$${CC}
+ QMAKE_LINK		= $${LINK}
+ QMAKE_LINK_SHLIB	= $${LINK_SHLIB}
+ 
  # Standard definitions --- don't change
  CONFIG      += warn_on release
  linux-g++:QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-sign-compare
