diff options
| -rw-r--r-- | perl-install/Makefile | 2 | ||||
| -rw-r--r-- | perl-install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/share/list | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index b3cec9518..f7bb6c20d 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 -lpe 'if (m|\*|) { @l = glob; !m|\*.*/| || @l == 1 and $$_ = join("\n", @l) } ' > /tmp/list + perl -lpe '@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; } diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 2ae492a9f..113021b1f 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -523,7 +523,9 @@ sub main { install_any::remove_unused(0); mkdir '/tmp/stage2/etc/brltty'; mkdir '/lib/brltty'; - install_any::getAndSaveFile("/etc/brltty/$o->{brltty}{table}", "/tmp/stage2/etc/brltty/$o->{brltty}{table}") if $o->{brltty}{table}; + foreach ($o->{brltty}{table}, "$brltty-$o->{brltty}{driver}.hlp") { + install_any::getAndSaveFile($_ , "/tmp/stage2/$_") if $_; + } install_any::getAndSaveFile("/lib/brltty/libbrlttyb$o->{brltty}{driver}.so") or do { warn("Braille driver $o->{brltty}{driver} for BRLTTY was not found.\n", "Press ENTER to continue.\n"); diff --git a/perl-install/share/list b/perl-install/share/list index 2eaceadb0..afc13317a 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -164,4 +164,5 @@ /bin/brltty /etc/brltty/text.*.tbl -/lib/brltty/libbrlttyb*.so +/etc/brltty/brltty-??.hlp +/lib/brltty/libbrlttyb??.so |