summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-29 13:23:55 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-29 13:23:55 +0000
commitb6e2865096ad48134b39f78a3c969cc48a684908 (patch)
tree4b1661d0f6ffba61f407a8d9eb6133a18f2709dd /perl-install
parenta9accf375cabd4bc52f26de938a9a23d5639386c (diff)
downloaddrakx-b6e2865096ad48134b39f78a3c969cc48a684908.tar
drakx-b6e2865096ad48134b39f78a3c969cc48a684908.tar.gz
drakx-b6e2865096ad48134b39f78a3c969cc48a684908.tar.bz2
drakx-b6e2865096ad48134b39f78a3c969cc48a684908.tar.xz
drakx-b6e2865096ad48134b39f78a3c969cc48a684908.zip
- 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)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile11
1 files changed, 6 insertions, 5 deletions
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'