From 29dbc8c49c643d5d18f64907ca9d5104ad9cf08e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 9 Mar 2000 13:17:29 +0000
Subject: no_comment

---
 perl-install/Makefile        | 4 ++--
 perl-install/Makefile.config | 2 +-
 perl-install/share/list      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile b/perl-install/Makefile
index c7255effd..5443526d5 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -57,7 +57,7 @@ get_needed_files: $(DIRS)
 #	export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null
 	perl -pe "s/ARCH/$(ARCH)/g" share/list > /tmp/list
 #	perl -pi -e 's/00503/5.660/g' /tmp/list
-	cat `specific_arch share/list` >> /tmp/list
+	cat `../tools/specific_arch share/list` >> /tmp/list
 	find auto -follow -name "*.so" >> /tmp/list
 
 	for i in $(LOCALFILES) `cat /tmp/list` ; do \
@@ -109,7 +109,7 @@ endif
 
 	perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' aliases
 
-	for i in fonts keyboards locales gconv; do tar xfy `specific_arch share/$$i.tar.bz2` -C $(DEST); done
+	for i in fonts keyboards locales gconv; do tar xfy `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done
 
 	cp -a modparm.lst $(DEST)/usr/share
 	cd share ; cp -a keymaps $(DEST)/usr/share
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index d32328662..80ffaf36e 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -14,7 +14,7 @@ STAGE2      = $(ROOTDEST)/Mandrake/base/mdkinst_stage2
 BASE        = $(ROOTDEST)/Mandrake/base
 DESTREP4PMS = $(DEST)$(REP4PMS)
 PERL        = perl
-LOCALFILES  = $(patsubst %, ../tools/%,$(ARCH)/e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+ extract_archive)
+LOCALFILES  = $(patsubst %, ../tools/%,$(ARCH)/e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+)
 DIRS        = c Newt pci_probing resize_fat #po 
 CFLAGS	    = -Wall
 override CFLAGS  += -pipe
diff --git a/perl-install/share/list b/perl-install/share/list
index 7fcddc96e..64753eafe 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -14,6 +14,7 @@
 /sbin/raidstart
 /usr/X11R6/lib/X11/Cards
 /usr/bin/bzip2
+/usr/bin/extract_archive
 /usr/bin/perl
 /usr/lib/gconv/BIG5.so
 /usr/lib/gconv/EUC-JP.so
-- 
cgit v1.2.1