[svn:parrot] r44984 - in trunk: config/gen/makefiles config/init lib/Parrot/Configure/Options lib/Parrot/Configure/Options/Conf tools/dev

[gerd at svn.parrot.org]

Author: gerd
Date: Wed Mar 17 17:09:04 2010
New Revision: 44984
URL: https://trac.parrot.org/parrot/changeset/44984

Log:
add the option: "perl Configure.pl --pkgconfigdir=DIR"

Modified:
   trunk/config/gen/makefiles/root.in
   trunk/config/init/defaults.pm
   trunk/lib/Parrot/Configure/Options/Conf.pm
   trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
   trunk/tools/dev/install_files.pl

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Wed Mar 17 13:54:02 2010	(r44983)
+++ trunk/config/gen/makefiles/root.in	Wed Mar 17 17:09:04 2010	(r44984)
@@ -2367,6 +2367,7 @@
     --destdir=$(DESTDIR) \
     --docdir=$(DOC_DIR) \
     --versiondir=$(VERSION_DIR) \
+    --pkgconfigdir=@PKGCONFIG_DIR@ \
     MANIFEST MANIFEST.generated
 
 install-dev-only: installable

Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm	Wed Mar 17 13:54:02 2010	(r44983)
+++ trunk/config/init/defaults.pm	Wed Mar 17 17:09:04 2010	(r44984)
@@ -249,6 +249,8 @@
         no_lines_flag => $conf->options->get('no-line-directives') ? '--no-lines' : '',
 
         tempdir => File::Spec->tmpdir,
+
+        PKGCONFIG_DIR => $conf->options->get('pkgconfigdir') || '',
     );
 
     # TT #855:  Profiling options are too specific to GCC

Modified: trunk/lib/Parrot/Configure/Options/Conf.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf.pm	Wed Mar 17 13:54:02 2010	(r44983)
+++ trunk/lib/Parrot/Configure/Options/Conf.pm	Wed Mar 17 17:09:04 2010	(r44984)
@@ -157,6 +157,8 @@
     --oldincludedir=DIR   C header files for non-gcc [/usr/include]
     --infodir=DIR         info documentation [PREFIX/info]
     --mandir=DIR          man documentation [PREFIX/man]
+    --pkgconfigdir=DIR    subdirectory of <libdir> for pkgconfig
+                              [<libdir>/pkgconfig/<version>]
 
 EOT
     return 1;

Modified: trunk/lib/Parrot/Configure/Options/Conf/Shared.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Options/Conf/Shared.pm	Wed Mar 17 13:54:02 2010	(r44983)
+++ trunk/lib/Parrot/Configure/Options/Conf/Shared.pm	Wed Mar 17 17:09:04 2010	(r44984)
@@ -61,6 +61,7 @@
     ops
     optimize
     parrot_is_shared
+    pkgconfigdir
     prefix
     profile
     sbindir

Modified: trunk/tools/dev/install_files.pl
==============================================================================
--- trunk/tools/dev/install_files.pl	Wed Mar 17 13:54:02 2010	(r44983)
+++ trunk/tools/dev/install_files.pl	Wed Mar 17 17:09:04 2010	(r44984)
@@ -159,9 +159,11 @@
             my($filehash) = @_;
             # For the time being this is hardcoded as being installed under
             # libdir as it is typically done with automake installed packages.
-            # If there is a use case to make this configurable we'll add a
-            # seperate --pkgconfigdir option.
+            # If the --pkgconfigdir option is used, then the default value will
+            # be overwritten with the specified subdirectory under libdir.
             $filehash->{DestDirs} = ['pkgconfig', $parrotdir];
+            $filehash->{DestDirs} = [$options{pkgconfigdir}]
+                if $options{pkgconfigdir};
             return($filehash);
         },
     },