summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 454af620..ab10608d 100644
--- a/Makefile
+++ b/Makefile
@@ -34,12 +34,9 @@ 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
+ cd ..; rm -rf $(NAME)
rpm: tar
cp -f ../$(TAR) $(RPM)/SOURCES