summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-07-05 09:10:12 +0000
committerFrancois Pons <fpons@mandriva.com>2002-07-05 09:10:12 +0000
commit48951ca9b14292317358cf9bc6813c14c1c809fe (patch)
treeaa2892f4c89200ce5fbf7ffbf2a6af079d2444f3
parente5d49e8a664f9b0d0f275b2fc50e6dae1f0043de (diff)
downloaddrakx-backup-do-not-use-48951ca9b14292317358cf9bc6813c14c1c809fe.tar
drakx-backup-do-not-use-48951ca9b14292317358cf9bc6813c14c1c809fe.tar.gz
drakx-backup-do-not-use-48951ca9b14292317358cf9bc6813c14c1c809fe.tar.bz2
drakx-backup-do-not-use-48951ca9b14292317358cf9bc6813c14c1c809fe.tar.xz
drakx-backup-do-not-use-48951ca9b14292317358cf9bc6813c14c1c809fe.zip
- handle /lib/i686 case
- replace Mandrake/RPMS with Mandrake/RPMS*
-rw-r--r--perl-install/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 3e3a1d497..62cb5b706 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -85,7 +85,7 @@ get_needed_files: $(DIRS) $(MOFILES)
find auto -follow -name "*.so" >> /tmp/list
for i in $(LOCALFILES) `cat /tmp/list` ; do \
- ldd $$i 2>/dev/null | grep "=>" | sed -e 's/.*=> //' -e 's/ .*//' | uniq | sort >> /tmp/list; \
+ ldd $$i 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/lib/.*?/,/lib/,' | sort | uniq >> /tmp/list; \
done
perl -Mlang -I. -e 'print "$$_\n" foreach lang::console_font_files()' >> /tmp/list
@@ -160,7 +160,7 @@ endif
cd share ; cp -a themes $(DEST)/usr/share/gtk
cd share ; cp compssUsers compssUsers.* rpmsrate $(ROOTDEST)/Mandrake/base
- clean-rpmsrate $(ROOTDEST)/Mandrake/base/rpmsrate $(ROOTDEST)/Mandrake/RPMS
+ clean-rpmsrate $(ROOTDEST)/Mandrake/base/rpmsrate $(ROOTDEST)/Mandrake/RPMS*
for i in ../kernel/modules.description ../kernel/all.modules/modules.cz*; do cp -f $$i $(DEST)/lib/; done