ChangeLogTag: Thu Mar 10 20:13:58 2005 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 27 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 65fb9b09..d42ae0ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 10 20:13:58 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* modules/AutomakeWorkspaceCreator.pm:
+
+	  Scan project Makefile.am's for pkgconfig_DATA, if it is present
+	  emit "pkgconfigdir = @libdir@/pkgconfig" at the begining of the
+	  workspace Makefile.am.  This will help avoid typos like the ACE
+	  pkgconfigdir definition in 5.4.4.
+
 Wed Mar  9 08:53:39 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/ProjectCreator.pm:
diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm
index a7136b2c..24a2f094 100644
--- a/modules/AutomakeWorkspaceCreator.pm
+++ b/modules/AutomakeWorkspaceCreator.pm
@@ -183,6 +183,7 @@ sub write_comps {
   my(%conditional_targets) = ();
   my(%seen) = ();
   my($installable_headers) = undef;
+  my($installable_pkgconfig) = undef;
   my($includedir) = undef;
   my($project_name) = undef;
 
@@ -222,6 +223,9 @@ sub write_comps {
               $conditional_targets{$1} = 1;
               unshift(@need_blanks, $1);
             }
+            if (/^pkgconfig_DATA/) {
+                $installable_pkgconfig= 1;
+            }
           }
           elsif (/^$inc_pattern\s*=\s*/ || /^$pkg_pattern\s*=\s*/) {
             $installable_headers = 1;
@@ -243,13 +247,21 @@ sub write_comps {
   ## Print out the Makefile.am.
   my($wsHelper) = WorkspaceHelper::get($self);
   my($convert_header_name) = undef;
-  if (!defined $includedir && $installable_headers) {
-    my($incdir) = $wsHelper->modify_value('includedir',
-                                          $self->get_includedir());
-    if ($incdir ne '') {
-      print $fh "includedir = \@includedir\@$incdir$crlf$crlf";
-      $convert_header_name = 1;
+  if ((!defined $includedir && $installable_headers)
+      || $installable_pkgconfig) {
+    if (!defined $includedir && $installable_headers) {
+      my($incdir) = $wsHelper->modify_value('includedir',
+                                            $self->get_includedir());
+      if ($incdir ne '') {
+        print $fh "includedir = \@includedir\@$incdir$crlf";
+        $convert_header_name = 1;
+      }
+    }
+    if ($installable_pkgconfig) {
+       print $fh "pkgconfigdir = \@libdir\@/pkgconfig$crlf";
     }
+
+    print $fh $crlf;
   }
 
   if (@locals) {