RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: mongo                            Date:   16-Sep-2010 22:36:01
  Branch: HEAD                             Handle: 2010091620360100

  Modified files:
    mongo                   SConstruct

  Log:
    - mongo: hotwire paths needed to share a TM -ljs with GPSEE for use by
    RPM.

  Summary:
    Revision    Changes     Path
    1.3         +5  -5      mongo/SConstruct
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: mongo/SConstruct
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 SConstruct
  --- mongo/SConstruct	15 Sep 2010 19:53:03 -0000	1.2
  +++ mongo/SConstruct	16 Sep 2010 20:36:01 -0000	1.3
  @@ -551,8 +551,8 @@
           if installDir == DEFAULT_INSTALL_DIR and not distBuild:
               installDir = "/usr/64/"
       else:
  -        env.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
  -        env.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib"]) )
  +        env.Append( CPPPATH=filterExists(["/usr/lib/rpm/include", "/opt/local/lib/rpm/include", "/usr/include/nspr", "/opt/local/include/nspr", "/sw/include", "/opt/local/include"]) )
  +        env.Append( LIBPATH=filterExists(["/usr/lib/rpm/lib", "/opt/local/lib/rpm/lib", "/sw/lib/", "/opt/local/lib"]) )
   
   elif "linux2" == os.sys.platform:
       linux = True
  @@ -958,7 +958,7 @@
       if windows:
           myenv.Append( CPPDEFINES=[ "XP_WIN" ] )
       else:
  -        myenv.Append( CPPDEFINES=[ "XP_UNIX" ] )
  +        myenv.Append( CPPDEFINES=[ "XP_UNIX", "XULRUNNER" ] )
   
       if solaris:
           conf.CheckLib( "nsl" )
  @@ -1254,8 +1254,8 @@
           shellEnv["LINKFLAGS"].remove("-m64")
           shellEnv["CPPPATH"].remove( "/usr/64/include" )
           shellEnv["LIBPATH"].remove( "/usr/64/lib" )
  -        shellEnv.Append( CPPPATH=filterExists(["/sw/include" , "/opt/local/include"]) )
  -        shellEnv.Append( LIBPATH=filterExists(["/sw/lib/", "/opt/local/lib" , "/usr/lib"]) )
  +        shellEnv.Append( CPPPATH=filterExists(["/usr/lib/rpm/include", "/opt/local/lib/rpm/include", "/sw/include" , "/opt/local/include"]) )
  +        shellEnv.Append( LIBPATH=filterExists(["/usr/lib/rpm/lib", "/opt/local/lib/rpm/lib", "/sw/lib/", "/opt/local/lib" , "/usr/lib"]) )
   
       l = shellEnv["LIBS"]
   
  @@ .