summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-04 13:25:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-04 13:25:28 +0000
commit11a4bbd1bc6c7b2251c6301cb5d03ce09d21573b (patch)
treecee6a5b7c05ecb8a47d92436d4bce481e7808784
parentf510403178ef8b8c49bca04c97a22cb4e2eeef36 (diff)
downloaddrakx-11a4bbd1bc6c7b2251c6301cb5d03ce09d21573b.tar
drakx-11a4bbd1bc6c7b2251c6301cb5d03ce09d21573b.tar.gz
drakx-11a4bbd1bc6c7b2251c6301cb5d03ce09d21573b.tar.bz2
drakx-11a4bbd1bc6c7b2251c6301cb5d03ce09d21573b.tar.xz
drakx-11a4bbd1bc6c7b2251c6301cb5d03ce09d21573b.zip
wildcard * in share/list allowed to match multiple files, but not multiple directories
-rw-r--r--perl-install/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index e13a8da71..b3cec9518 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -84,7 +84,7 @@ get_needed_files: $(DIRS) $(MOFILES)
eval `perl -V:version`; \
cat share/list `../tools/specific_arch share/list` | \
perl -pe "s/ARCH/$(ARCH)/g ; s/PERL_VERSION/$$version/g ; s|/LIB/|/$(LIB)/|g " | \
- perl -pe 'if (/\*/) { @l = glob; @l == 1 and $$_ = "$$l[0]\n" } ' > /tmp/list
+ perl -lpe 'if (m|\*|) { @l = glob; !m|\*.*/| || @l == 1 and $$_ = join("\n", @l) } ' > /tmp/list
rpm -ql perl-GTK2 | grep '^/usr/lib/perl5' >> /tmp/list
@missing=`perl -lne 'print if !-e $$_' /tmp/list`; [ -z "$$missing" ] || { echo "missing or multiple files vvvvvvvvvvvvvvvvvvvvvvvvvv" ; echo "$$missing" ; echo "missing or multiple files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" ; exit 1; }