summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-12 13:13:04 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-12 13:13:04 +0000
commit134fa3236ef77209d5dc0c540262ac3279540927 (patch)
tree88b7e0499ac0300263a82ae121ce8bbb970fb675
parent4198931416edb98bae7a822b2490ffb99c6ff20f (diff)
downloaddrakx-134fa3236ef77209d5dc0c540262ac3279540927.tar
drakx-134fa3236ef77209d5dc0c540262ac3279540927.tar.gz
drakx-134fa3236ef77209d5dc0c540262ac3279540927.tar.bz2
drakx-134fa3236ef77209d5dc0c540262ac3279540927.tar.xz
drakx-134fa3236ef77209d5dc0c540262ac3279540927.zip
handle poulpy code
-rw-r--r--perl-install/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index c0e95718f..6aa85ce82 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -64,7 +64,7 @@ install_pms: $(DIRS)
dest=$(DESTREP4PMS)/`dirname $$i`; \
install -d $$dest; \
perl -ne 'print' $$i > $(DESTREP4PMS)/$$i; \
- perl -pe 's/#[-+].*//; $$_ = "\n" if (/^=(head|begin)/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \
+ perl -pe 's/#[-+].*//; $$_ = "\n" if (/^=(head|begin)/ .. /^=cut/) || /use (diagnostics|strict|vars|warnings)/' $$i > $(DESTREP4PMS)/$$i; \
done
if [ "x$(PERL_INSTALL_DEBUG)" == "x" ]; then \
perl -pi -e 's|#!/usr/bin/perl -d.*\n|#!/usr/bin/perl\n|' $(DESTREP4PMS)/install2; \
@@ -147,7 +147,7 @@ endif
fi; \
fi; \
done
- perl -pi -e 's/\s*use\s+(warnings|diagnostics|vars|strict).*//g' $(DEST)/usr/*/*/*/utf8_heavy.pl
+ perl -pi -e 's/\s*use\s+(warnings|diagnostics|strict|vars|warnings).*//g' $(DEST)/usr/*/*/*/utf8_heavy.pl
mv -f $(DEST)/bin/* $(DEST)/sbin/* $(DEST)/usr/bin
cd $(DEST)/usr/bin ; mv insmod insmod_
@@ -259,5 +259,5 @@ cvstag:
cd ..; cvs tag $(CVSTAGOPT) $(TAG) $(OTHERS)
nuke_perl:
- find ../$(PACKAGE)-$(PKGVERSION) -name '*.pm' | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
- find ../$(PACKAGE)-$(PKGVERSION)/standalone -type f | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
+ find ../$(PACKAGE)-$(PKGVERSION) -name '*.pm' | xargs perl -pi -e 's/\s*use\s+(diagnostics|strict|vars|warnings).*//g'
+ find ../$(PACKAGE)-$(PKGVERSION)/standalone -type f | xargs perl -pi -e 's/\s*use\s+(diagnostics|strict|vars|warnings).*//g'