switch to perl only

1 files changed, 17 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 212a342f..a4a8ceeb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,11 @@ TAR = $(NAME).tar.bz2
 # TODO: get WIZ_HOME take care of usr prefix 
 WIZ_HOME=/usr/share/wizards
 
-WIZ =	common\
-        server_wizard\
-	dhcp_wizard\
+PERL_VENDORLIB=$(shell eval "`perl -V:installvendorlib`"; installvendorlib=$${installvendorlib\#/usr}; echo $$installvendorlib)
+
+WIZ =   dhcp_wizard\
+	client_wizard\
+	server_wizard\
 	dns_wizard\
 	postfix_wizard\
 	samba_wizard\
@@ -15,12 +17,11 @@ WIZ =	common\
 	web_wizard\
 	ftp_wizard\
 	news_wizard\
-	client_wizard\
-	db_wizard\
 	proxy_wizard\
-	nfs_wizard\
-	data\
-	po
+	nfs_wizard
+
+OTHER = data\
+        po
 
 all:
 
@@ -28,10 +29,17 @@ all:
 
 install:
 	mkdir -p ${prefix}/sbin
+	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards/client_wizard/images
+	mkdir -p ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard/
 	install -p drakwizard.pl ${prefix}/sbin/drakwizard
 	perl -i -pe "s|__WIZ_HOME__|$(WIZ_HOME)/|g" ${prefix}/sbin/drakwizard 
+	for l in $(OTHER); do \
+	        $(MAKE) -C $$l $@; \
+	done
+	install --mode=u=rw,g=r,o=r -p common/*.pm ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard/; \
 	for l in $(WIZ); do \
-		$(MAKE) -C $$l $@; \
+	        install --mode=u=rw,g=r,o=r -p $$l/*.pm ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard/; \
+	        install --mode=a=r -p $$l/images/*.png ${prefix}/share/wizards/client_wizard/images; \
 	done
 	find ${prefix}/share/wizards -type f -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \
 		perl -i -pe "s|__WIZ_HOME__|$(WIZ_HOME)|g" \{\} \;