summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Desmons <adesmons@mandriva.com>2002-08-19 12:28:57 +0000
committerArnaud Desmons <adesmons@mandriva.com>2002-08-19 12:28:57 +0000
commit7dde5fbdf5daa54124810d8e55d3fe5262f201b9 (patch)
tree3ee7c0b753d0eef9dcaedf10ad4aa53cca2a02c6
parent4959b2762ffa80445cf7b1554e6528d0421db7dd (diff)
downloaddrakwizard-7dde5fbdf5daa54124810d8e55d3fe5262f201b9.tar
drakwizard-7dde5fbdf5daa54124810d8e55d3fe5262f201b9.tar.gz
drakwizard-7dde5fbdf5daa54124810d8e55d3fe5262f201b9.tar.bz2
drakwizard-7dde5fbdf5daa54124810d8e55d3fe5262f201b9.tar.xz
drakwizard-7dde5fbdf5daa54124810d8e55d3fe5262f201b9.zip
added .sh for __WIZ_HOME__ replacement
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
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" \{\} \;