Index: trunk/glueforge/glueforge.in
===================================================================
--- trunk/glueforge/glueforge.in	(revision 3861)
+++ trunk/glueforge/glueforge.in	(revision 3908)
@@ -3,5 +3,5 @@
 # Copyright (C) 2005  Joshua Hoblitt
 #
-# $Id: glueforge.in,v 1.7 2005-05-06 04:07:42 jhoblitt Exp $
+# $Id: glueforge.in,v 1.8 2005-05-13 01:37:53 jhoblitt Exp $
 
 use strict;
@@ -51,8 +51,8 @@
 }
 
-$data{object_name} = $data{table_name} . "Row";
-$data{lib_name}    = $data{table_name} . "db";
-$data{file_name}   = $data{lib_name};
+$data{pkg_name}    = $data{table_name} . "db";
+$data{file_name}   = $data{pkg_name};
 $data{namespace}   = $data{table_name};
+$data{object_name} = $data{namespace} . "Row";
 
 my @items;
@@ -77,10 +77,10 @@
 $data{columns} = \@items;
 
-$output = $data{lib_name} unless defined $output;
+$output = $data{pkg_name} unless defined $output;
 
 my %tt = (
     'autogen_sh.tt'         => "$output/autogen.sh",
     'configure_ac.tt'       => "$output/configure.ac",
-    'pkgconfig_pc_in.tt'    => "$output/$data{lib_name}.pc.in",
+    'pkgconfig_pc_in.tt'    => "$output/$data{pkg_name}.pc.in",
     'top_makefile_am.tt'    => "$output/Makefile.am",
     'src_makefile_am.tt'    => "$output/src/Makefile.am",