From 7dde5fbdf5daa54124810d8e55d3fe5262f201b9 Mon Sep 17 00:00:00 2001
From: Arnaud Desmons <adesmons@mandriva.com>
Date: Mon, 19 Aug 2002 12:28:57 +0000
Subject: added .sh for __WIZ_HOME__ replacement

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e6b4d87a..454af620 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ WIZ =	common\
 # installs all the wizards...
 
 install:
-	find -regex ".*\.wiz$$\|.*.pm$$" -exec \
+	find -regex ".*\.wiz$$\|.*.pm$$\|.*\.sh$$" -exec \
 		perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \;
 	mkdir -p ${prefix}/sbin
 	install -p drakwizard.pl ${prefix}/sbin/drakwizard
@@ -34,8 +34,12 @@ clean:
 	rm -f *~
 
 tar: clean
+<<<<<<< Makefile
+	cd .. ; ln -s wizard_perl $(NAME); tar cf - $(NAME) | bzip2 -9 >$(TAR)
+=======
 	cd ..; cp -rf wizard_perl $(NAME)
 	cd ..; tar cf - $(NAME) | bzip2 -9 > $(TAR)
+>>>>>>> 1.7
 
 rpm: tar 
 	cp -f ../$(TAR) $(RPM)/SOURCES
@@ -50,5 +54,5 @@ test:	clean_test
 	mkdir test
 	cp -r $(WIZ) test
 	cp Wizard.dtd Makefile drakwizard.pl drakwizard.spec test
-	find test -regex ".*\.wiz$$\|.*.pm$$" -exec \
+	find test -regex ".*\.wiz$$\|.*\.pm$$\|.*\.sh$$" -exec \
 		perl -pi -e "s|__WIZ_HOME__|$(PWD)/test|g" \{\} \;
-- 
cgit v1.2.1