2.1

1 files changed, 11 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index a4de6348..3e709474 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME = drakwizard
 TAR = $(NAME).tar.bz2
 
 # TODO: get WIZ_HOME take care of usr prefix 
-WIZ_HOME=/usr/share/wizards
+WIZ_HOME=/usr/share/wizards/
 
 PERL_VENDORLIB=$(shell eval "`perl -V:installvendorlib`"; installvendorlib=$${installvendorlib\#/usr}; echo $$installvendorlib)
 
@@ -29,21 +29,26 @@ 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; s|$$ENV{__WIZ_HOME__}|$(WIZ_HOME)/|g" ${prefix}/sbin/drakwizard 
+	perl -i -pe "s,(__WIZ_HOME__|\i\\$$ENV{__WIZ_HOME__}),$(WIZ_HOME),g" ${prefix}/sbin/drakwizard 
 	perl -i -pe "s|new IFCFG|new MDK::Wizard::IFCFG|g" common/Wizcommon.pm
 	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 \
+	        install --mode=u=rwx,g=rx,o=rx -d ${prefix}/share/wizards/$$l/images/; \
 	        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; \
+	        install --mode=a=r -p $$l/images/*.png ${prefix}/share/wizards/$$l/images; \
 	done
-	find ${prefix}/share/wizards -type f -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \
-		perl -i -pe "s|__WIZ_HOME__|$(WIZ_HOME)|g; s|$$ENV{__WIZ_HOME__}|$(WIZ_HOME)/|g" \{\} \;
+	find ${prefix}/$(PERL_VENDORLIB)/MDK/Wizard -type f -regex ".*.pm$$" \
+		-exec perl -i -pe "s,(\\\$$ENV{__WIZ_HOME__}|__WIZ_HOME__),$(WIZ_HOME),g" \{\} \;
+
+pitest:
+	cp samba_wizard/Samba.pm .
+	perl -i -pe "s,\\\$$ENV{__WIZ_HOME__},$(WIZ_HOME),g" Samba.pm
+	grep defaultimage Samba.pm
 
 clean:
 	$(MAKE) -C po $@