diff options
author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-03-11 04:17:26 +0000 |
---|---|---|
committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-03-11 04:17:26 +0000 |
commit | 42b43c49c13b2df59592a8e47b25377a84849e86 (patch) | |
tree | 726b1178efef331e3bb9791049d5a22887637a5f /modules/AutomakeWorkspaceCreator.pm | |
parent | 61dac22b7ffbbfc6c4d080ec4f63b65f7f8104e3 (diff) | |
download | MPC-42b43c49c13b2df59592a8e47b25377a84849e86.tar.gz |
ChangeLogTag: Thu Mar 10 20:13:58 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'modules/AutomakeWorkspaceCreator.pm')
-rw-r--r-- | modules/AutomakeWorkspaceCreator.pm | 24 |
1 files changed, 18 insertions, 6 deletions
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) { |