From b6e2865096ad48134b39f78a3c969cc48a684908 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 29 Jul 2002 13:23:55 +0000 Subject: - consolidate duplicated 'use (warn|strict...' into nuke_perl target - thus enable to fix bug reported by gc (aka i only fixed localsrpm nuke, not srpm: one) --- perl-install/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'perl-install/Makefile') diff --git a/perl-install/Makefile b/perl-install/Makefile index 714002815..2fedd7e13 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -37,8 +37,7 @@ localcopy: clean $(MAKE) -C ../tools clean || : cd .. ; rm -rf $(PACKAGE)-$(PKGVERSION) ; cp -af perl-install $(PACKAGE)-$(PKGVERSION) ; cp -af $(OTHERS) $(PACKAGE)-$(PKGVERSION) cd - 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' + @make nuke_perl $(DIRS): @@ -236,10 +235,12 @@ export: cd ..; cvs export -d $(PACKAGE)-$(PKGVERSION) -r $(TAG) $(PACKAGE) cd ../$(PACKAGE)-$(PKGVERSION) && rm -rf $(OTHERDIRS) && set -x && for f in $(OTHERDIRS); do cvs -d `cat ../CVS/Root` export -r $(TAG) -d `basename $$f` gi/$$f; done cd ..; set -x && for f in $(OTHERFILES); do cvs -d `cat ../CVS/Root` export -r $(TAG) -d $(PACKAGE)-$(PKGVERSION) gi/$$f; done - 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' - + @make nuke_perl cvstag: cvs tag $(CVSTAGOPT) $(TAG) 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' -- cgit v1.2.1