[xml-cppdom-checkins] SF.net SVN: xml-cppdom: [558] trunk/SConstruct

[<pat...@us...>]

Revision: 558
          http://svn.sourceforge.net/xml-cppdom/?rev=558&view=rev
Author:   patrickh
Date:     2006-09-20 09:40:55 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Put the .fpc file in the flagpoll directory rather than the pkg-config
directory. I am committing this on Dan's behalf because he is getting
403 forbidden errors for some reason.

Modified Paths:
--------------
    trunk/SConstruct

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2006-08-16 15:16:08 UTC (rev 557)
+++ trunk/SConstruct	2006-09-20 16:40:55 UTC (rev 558)
@@ -136,7 +136,7 @@
    base_inst_paths = {}
    base_inst_paths['base'] = os.path.abspath(common_env['prefix'])
    base_inst_paths['lib'] = pj(base_inst_paths['base'], 'lib')
-   base_inst_paths['pkgconfig'] = pj(base_inst_paths['lib'], 'pkgconfig')
+   base_inst_paths['flagpoll'] = pj(base_inst_paths['lib'], 'flagpoll')
    base_inst_paths['bin'] = pj(base_inst_paths['base'], 'bin')
    if common_env['versioning'] == True:
       version_suffix = "-%s_%s_%s" % CPPDOM_VERSION
@@ -185,7 +185,7 @@
          SConscript(pj(d,'SConscript'), build_dir=pj(full_build_dir, d), duplicate=0)
 
       # Build up the provides vars for the .fpc files
-      inst_paths['pkgconfig'] = pj(inst_paths['lib'],'pkgconfig')
+      inst_paths['flagpoll'] = pj(inst_paths['lib'],'flagpoll')
       provides = "cppdom"
       # XXX: provides data
       #if combo["type"] != "optimized":
@@ -220,7 +220,7 @@
          if combo["type"] != "optimized":
             name_parts.append(combo["type"])
          pc_filename = "-".join(name_parts) + ".fpc"
-         cppdom_pc  = build_env.SubstBuilder(pj(inst_paths['pkgconfig'],pc_filename), 
+         cppdom_pc  = build_env.SubstBuilder(pj(inst_paths['flagpoll'],pc_filename), 
                                         'cppdom.fpc.in', submap=submap)
          build_env.AddPostAction (cppdom_pc, Chmod('$TARGET', 0644))
          build_env.Depends(cppdom_pc, 'cppdom/version.h')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.