summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-10 13:25:17 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-10 13:25:17 +0000
commit1a435f331d81ed6d1a62c3d46de606ec44f8adc5 (patch)
tree213152b5cd5966006fc9dce572e23c5d6d856c62
parent79c5bcdedd4899432abe8569197b641da18a6712 (diff)
downloaddrakx-backup-do-not-use-1a435f331d81ed6d1a62c3d46de606ec44f8adc5.tar
drakx-backup-do-not-use-1a435f331d81ed6d1a62c3d46de606ec44f8adc5.tar.gz
drakx-backup-do-not-use-1a435f331d81ed6d1a62c3d46de606ec44f8adc5.tar.bz2
drakx-backup-do-not-use-1a435f331d81ed6d1a62c3d46de606ec44f8adc5.tar.xz
drakx-backup-do-not-use-1a435f331d81ed6d1a62c3d46de606ec44f8adc5.zip
remove all (use\s+(diagnostics|vars|strict)' instances
-rw-r--r--perl-install/Makefile4
-rw-r--r--perl-install/Makefile.drakxtools2
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 16e7c6cae..373ccebc3 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -36,6 +36,10 @@ localcopy: clean
rm -rf standalone/pixmaps
$(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'
+
$(DIRS):
install -d auto
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index bae306025..0801446f1 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -50,8 +50,6 @@ install:
install -d $(LIBDEST)/diskdrake
install -m 644 diskdrake/*.pm $(LIBDEST)/diskdrake
- find $(LIBDEST) -name "*.pm" | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict)//g'
-
for i in $(HAVEINST_DIRS); do \
$(MAKE) -C $$i install PREFIX=$(PREFIX) DATADIR=$(DATADIR) NAME=$(NAME) ; \
done