From 2fc65cb88a7095bb2d6aa670d8dd39b3fe204340 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 21 Feb 2002 12:36:00 +0000
Subject: make a difference between PMS and ALLPMS. For install, only use PMS

---
 perl-install/Makefile          | 7 ++++---
 perl-install/Makefile.config   | 2 +-
 perl-install/share/po/Makefile | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Makefile b/perl-install/Makefile
index fc74b38f7..4037e95ab 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -7,7 +7,7 @@ MOFILES = $(POFILES:%.po=%.mo)
 
 all: TAGS $(DIRS)
 
-TAGS: $(PMS)
+TAGS: $(ALLPMS)
 	etags -o - $^ /usr/lib/perl5/site_perl/*/MDK/Common/*.pm | ./perl2etags > $@
 
 clean:
@@ -38,7 +38,7 @@ test_pms: verify_c
 	for i in install2 install_steps_*.pm; do perl -cw -I. $$i; done
 
 verify_c:
-	./verify_c $(PMS)
+	./verify_c $(ALLPMS)
 
 %.mo: %.po
 	msgfmt -o $@ $<
@@ -59,10 +59,11 @@ install_pms: $(DIRS)
 		perl -pe 's|#!/usr/bin/perl.*\n|#!/usr/bin/perl -d \n|' install2 > $(DESTREP4PMS)/install2; \
 	fi \
 
+	rm -f $(DESTREP4PMS)/{bootlook,tinyfirewall}.pm
+
 	cp share/*.rc $(DESTREP4PMS)
 	chmod a+x $(DESTREP4PMS)/install2
 	chmod a+x $(DESTREP4PMS)/commands
-	chmod a+x $(DESTREP4PMS)/standalone/*
 	chmod a+x $(DESTREP4PMS)/g_auto_install
 	chmod a+x $(DESTREP4PMS)/live_install*
 
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 2b6565d2b..294e6a748 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -8,7 +8,7 @@ SO_FILES    = c/blib/arch/auto/c/c.so
 PMS         = *.pm Newt/*.pm c/stuff.pm resize_fat/*.pm sbus_probing/*.pm network/*.pm diskdrake/*.pm commands install2 g_auto_install live_install live_install2 share/advertising/*.pl
 STANDALONEPMS_ = diskdrake XFdrake mousedrake printerdrake logdrake keyboarddrake draknet drakbackup drakfont localedrake net_monitor drakbug_report tinyfirewall drakxconf drakxservices draksec drakboot adduserdrake drakgw drakautoinst livedrake lsnetdrake scannerdrake fileshareset drakxtv
 STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
-PMS	   += $(STANDALONEPMS)
+ALLPMS	    = $(PMS) $(STANDALONEPMS)
 REP4PMS     = /usr/bin/perl-install
 ROOTDEST    = /export
 DEST        = $(ROOTDEST)/Mandrake/mdkinst
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 6fe34cbe3..957170d9f 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -1,6 +1,6 @@
 include ../../Makefile.config
 
-PMSFILES = $(wildcard $(PMS:%=../../%))
+PMSFILES = $(wildcard $(ALLPMS:%=../../%))
 PMSCFILES = $(PMSFILES:%=%_.c)
 
 # temporarly don't include ar.po,br.po,cy.po,ga.po,is.po,ro.po,sl.po
-- 
cgit v1.2.1