very shorter

1 files changed, 39 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index 703061dc..7a1c2307 100644
--- a/Makefile
+++ b/Makefile
@@ -2,79 +2,56 @@
 ## Don't edit this file, edit Makefile.proto
 ##
 
-VERSION=0.1
 RPM=$(HOME)/rpm
+NAME = drakwizard
+TAR = $(NAME).tar.bz2
+WIZ =	common\
+	server_wizard\
+	dhcp_wizard\
+	dns_wizard\
+	firewall_wizard\
+	global_wizard\
+	postfix_wizard\
+	samba_wizard\
+	time_wizard\
+	web_wizard\
+	ftp_wizard\
+	news_wizard\
+	client_wizard\
+	db_wizard\
+	proxy_wizard\
+	po
 
-rpm:
-	rm -rf drakwizard-$(VERSION)
-	mkdir drakwizard-$(VERSION)
-	cp -rf server_wizard drakwizard-$(VERSION)
-	cp -rf common drakwizard-$(VERSION)
-	cp -rf dhcp_wizard drakwizard-$(VERSION)
-	cp -rf dns_wizard drakwizard-$(VERSION)
-	cp -rf firewall_wizard drakwizard-$(VERSION)
-	cp -rf global_wizard drakwizard-$(VERSION)
-	cp -rf postfix_wizard drakwizard-$(VERSION)
-	cp -rf samba_wizard drakwizard-$(VERSION)
-	cp -rf time_wizard drakwizard-$(VERSION)
-	cp -rf web_wizard drakwizard-$(VERSION)
-	cp -rf ftp_wizard drakwizard-$(VERSION)
-	cp -rf news_wizard drakwizard-$(VERSION)
-	cp -rf client_wizard drakwizard-$(VERSION)
-	cp -rf db_wizard drakwizard-$(VERSION)
-	cp -rf proxy_wizard drakwizard-$(VERSION)
-	cp -rf po drakwizard-$(VERSION)
-	cp -f Wizard.dtd Makefile drakwizard.pl drakwizard.spec drakwizard-$(VERSION)
-	rm -f drakwizard-$(VERSION).tar.bz2
-	rm -f drakwizard-$(VERSION).tar
-	tar cvf drakwizard-$(VERSION).tar drakwizard-$(VERSION)
-	rm -rf drakwizard-$(VERSION)
-	bzip2 -z9 drakwizard-$(VERSION).tar
-	mv drakwizard-$(VERSION).tar.bz2 $(RPM)/SOURCES
-	cp -f drakwizard.spec $(RPM)/SPECS 
-	(cd $(RPM)/SPECS; rpm -ba drakwizard.spec)
 # installs all the wizards...
 
 install:
-	find -regex ".*\.wiz$$\|.*.pm$$" -exec perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \;
+	find -regex ".*\.wiz$$\|.*.pm$$" -exec \
+		perl -pi -e "s|__WIZ_HOME__|/usr/share/wizards|g" \{\} \;
 	mkdir -p ${prefix}/sbin
 	install -p drakwizard.pl ${prefix}/sbin/drakwizard
-	cd server_wizard; make prefix=${prefix} install
-	cd common; make prefix=${prefix} install
-	cd dhcp_wizard; make prefix=${prefix} install
-	cd dns_wizard; make prefix=${prefix} install
-	cd firewall_wizard; make prefix=${prefix} install
-	cd global_wizard; make prefix=${prefix} install
-	cd postfix_wizard; make prefix=${prefix} install
-	cd samba_wizard; make prefix=${prefix} install
-	cd time_wizard; make prefix=${prefix} install
-	cd web_wizard; make prefix=${prefix} install
-	cd ftp_wizard; make prefix=${prefix} install
-	cd news_wizard; make prefix=${prefix} install
-	cd client_wizard; make prefix=${prefix} install
-	cd db_wizard; make prefix=${prefix} install
-	cd proxy_wizard; make prefix=${prefix} install
-	cd po; make prefix=${prefix} install
+	for l in $(WIZ); do \
+		$(MAKE) -C $$l $@
+	done
+
+clean:
+	$(MAKE) -C po $@
+	rm -f *~
+
+tar: clean
+	cd .. ; ln wizard_perl $(NAME); tar cf - $(NAME) | bzip2 -9 >$(TAR)
+
+rpm: tar 
+	cp -f ../$(TAR) $(RPM)/SOURCES
+	cp -f $(NAME).spec $(RPM)/SPECS/
+	-rpm -ba $(NAME).spec
+	rm -f ../$(TAR)
 
 clean_test:
 	rm -rf test
 
 test:	clean_test
 	mkdir test
-	cp -rf server_wizard test
-	cp -rf common test
-	cp -rf dhcp_wizard test
-	cp -rf dns_wizard test
-	cp -rf firewall_wizard test
-	cp -rf global_wizard test
-	cp -rf postfix_wizard test
-	cp -rf samba_wizard test
-	cp -rf time_wizard test
-	cp -rf web_wizard test
-	cp -rf ftp_wizard test
-	cp -rf news_wizard test
-	cp -rf client_wizard test
-	cp -rf db_wizard test
-	cp -rf proxy_wizard test
+	cp -r $(WIZ) test
 	cp -f Wizard.dtd Makefile drakwizard.pl drakwizard.spec test
-	find test -regex ".*\.wiz$$\|.*.pm$$" -exec perl -pi -e "s|__WIZ_HOME__|$(PWD)/test|g" \{\} \;
+	find test -regex ".*\.wiz$$\|.*.pm$$" -exec \
+		perl -pi -e "s|__WIZ_HOME__|$(PWD)/test|g" \{\} \;