From def4efcd013dab2d39ca559f61df55ff60864157 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 31 Aug 1999 16:48:27 +0000
Subject: no_comment

---
 perl-install/Makefile   | 9 +++++++--
 perl-install/perl2etags | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100755 perl-install/perl2etags

(limited to 'perl-install')

diff --git a/perl-install/Makefile b/perl-install/Makefile
index d4e7e68c0..eb0a1d48f 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -19,7 +19,7 @@ override CFLAGS  += -pipe
 all: $(SO_FILES) $(DIRS)
 
 tags:
-	etags -o - $(PMS) | perl2etags > TAGS
+	etags -o - $(PMS) | ./perl2etags > TAGS
 
 clean:
 	test ! -e c/Makefile || $(MAKE) -C c clean
@@ -163,10 +163,15 @@ full_stage2:
 stage2:
 	$(MAKE) install_pms
 
-	dd if=/dev/zero of=$(STAGE2) bs=1M count=16
+	dd if=/dev/zero of=$(STAGE2) bs=1M count=12
 	echo y | /sbin/mke2fs $(STAGE2)
 	$(SUDO) mount $(STAGE2) /mnt/stage2 -o loop
+
+#	hack to reduce the STAGE2 image
+	mv $(DEST)/usr/X11R6/bin/XF86_SVGA /tmp
 	$(SUDO) cp -a $(DEST)/* /mnt/stage2
+	mv /tmp/XF86_SVGA $(DEST)/usr/X11R6/bin/
+
 	$(SUDO) umount $(STAGE2)
 	gzip -f -9 $(STAGE2)
 #	cd $(ROOTDEST) ; tar cfz /tmp/instimage-full.tgz Mandrake
diff --git a/perl-install/perl2etags b/perl-install/perl2etags
new file mode 100755
index 000000000..7a15bf78c
--- /dev/null
+++ b/perl-install/perl2etags
@@ -0,0 +1,8 @@
+#!/usr/bin/perl -p
+
+if (/^/ ... !/^/) {
+    ($package) = /(.*).pm,/;
+    $package =~ s|/|::|g;
+}
+
+s/(\x7F)sub\s+(\w+)(\([^)]*\))?/$1${package}::$2/;
-- 
cgit v1.2.1