From b05f73b9ba0db87d9608891483f3c90ab460816c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 5 Oct 2004 07:18:38 +0000 Subject: use TMPDIR --- perl-install/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/perl-install/Makefile b/perl-install/Makefile index 69a7969f5..4b01fa5f5 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -92,22 +92,22 @@ get_needed_files: $(DIRS) mo_files @if rpm -q XFree86-VGA16 | grep -q 29mdk; then echo "XFree86-VGA16 29mdk is bad, downgrade to 28mdk" ; exit 1 ; fi -# 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 +# 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" > $(TMPDIR)/list ' $(PERL) -d install2 < /dev/null 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 '@l = glob; !m|\*.*/| || @l == 1 and $$_ = join("\n", @l)' > /tmp/list - rpm -ql perl-Gtk2 perl-Glib | grep '^/usr/lib/perl5' | grep -v '\.pod$$' >> /tmp/list + perl -lpe '@l = glob; !m|\*.*/| || @l == 1 and $$_ = join("\n", @l)' > $(TMPDIR)/list + rpm -ql perl-Gtk2 perl-Glib | grep '^/usr/lib/perl5' | grep -v '\.pod$$' >> $(TMPDIR)/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; } + @missing=`perl -lne 'print if !-e $$_' $(TMPDIR)/list`; [ -z "$$missing" ] || { echo "missing or multiple files vvvvvvvvvvvvvvvvvvvvvvvvvv" ; echo "$$missing" ; echo "missing or multiple files ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" ; exit 1; } - find auto -follow -name "*.so" >> /tmp/list + find auto -follow -name "*.so" >> $(TMPDIR)/list - for i in $(LOCALFILES) `cat /tmp/list` ; do \ - ldd $$i 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/(lib(64)?)/.*?/,/\1/,' | sort | uniq >> /tmp/list; \ + for i in $(LOCALFILES) `cat $(TMPDIR)/list` ; do \ + ldd $$i 2>/dev/null | grep "=>" | perl -pe 's/.*=> //; s/ .*//; s,^/(lib(64)?)/.*?/,/\1/,' | sort | uniq >> $(TMPDIR)/list; \ done - perl -Mlang -I. -e 'print "$$_\n" foreach lang::console_font_files()' >> /tmp/list + perl -Mlang -I. -e 'print "$$_\n" foreach lang::console_font_files()' >> $(TMPDIR)/list install -d $(DEST)/etc install -d $(DEST)/etc/sysconfig/network-scripts @@ -135,7 +135,7 @@ ifeq (i386,$(ARCH)) install -s /sbin/cardmgr $(DEST)/usr/bin endif - for i in `cat /tmp/list`; do \ + for i in `cat $(TMPDIR)/list`; do \ if (echo $$i | grep -q "lib/[^/]*\.so"); then \ install -s $$i $(DEST)/lib; \ elif (echo $$i | grep -q "lib64/[^/]*\.so"); then \ -- cgit v1.2.1