summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-01-31 23:00:37 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-01-31 23:00:37 +0000
commitc711d3aa0abf84ba0d9a33fc929d74a05fca584c (patch)
tree6b6b55ce79c034cdbe492bb07e5df2c7ab970160
parentcf462649e3ac7c5d5f92a791707c231ea8d107b4 (diff)
downloadmultiarch-utils-c711d3aa0abf84ba0d9a33fc929d74a05fca584c.tar
multiarch-utils-c711d3aa0abf84ba0d9a33fc929d74a05fca584c.tar.gz
multiarch-utils-c711d3aa0abf84ba0d9a33fc929d74a05fca584c.tar.bz2
multiarch-utils-c711d3aa0abf84ba0d9a33fc929d74a05fca584c.tar.xz
multiarch-utils-c711d3aa0abf84ba0d9a33fc929d74a05fca584c.zip
better heuristics (e.g. gdlib-config, mysql_config, pth-config)
-rwxr-xr-xcheck-multiarch-files9
1 files changed, 4 insertions, 5 deletions
diff --git a/check-multiarch-files b/check-multiarch-files
index 8092426..33f64f7 100755
--- a/check-multiarch-files
+++ b/check-multiarch-files
@@ -29,13 +29,12 @@ while (<STDIN>) {
$multiarch_type = "binary";
# check for *-config script files
- if (/.+-config/ && $file_magic =~ /shell script/) {
+ if (/.+[-_]config/ && $file_magic =~ /shell script/) {
my $options;
foreach (cat_($_)) {
- $options .= " --cflags" if /\[--cflags\]/;
- $options .= " --libs" if /\[--libs\]/;
- $options .= " --ldflags" if /\[--ldflags\]/;
- $options .= " --cppflags" if /\[--cppflags\]/;
+ foreach my $opt (qw(cflags libs ldflags cppflags libdir)) {
+ $options .= " --$opt" if /(\[--$opt\]|--$opt\s+[\#\[])/;
+ }
}
# run the script to find out any libdir dependent flags
if ($options) {