X-Git-Url: http://gitweb.michael.orlitzky.com/?p=amavis-logwatch.git;a=blobdiff_plain;f=Makefile;h=e98397a2d1a84182eefc0f889045451ef96c8f89;hp=8f12319af8feb9d70e4b1f0f9015ebca0999826a;hb=HEAD;hpb=636bc2c515452cce509f679eb3fdc0d6177144bc

diff --git a/Makefile b/Makefile
index 8f12319..e98397a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ program_logwatch = amavis
 src = $(program) \
       $(program).conf \
       $(program).1 \
-      Changes Bugs Makefile README LICENSE
+      Changes Bugs README LICENSE
 
 prefix_logwatch = /etc/logwatch
 prefix_standalone = /usr/local
@@ -24,26 +24,49 @@ install:
 	@echo 'Run "make install-all" to install both'
 
 install-logwatch:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(scriptdir_logwatch) $(DESTDIR)$(confdir_logwatch) || exit 1;
-	$(INSTALL) -m 0644 $(program) $(DESTDIR)$(scriptdir_logwatch)/$(program_logwatch) || exit 1;
-	$(INSTALL) -m 0644 $(program).conf $(DESTDIR)$(confdir_logwatch)/$(program_logwatch).conf || exit 1;
+	$(INSTALL) -d -m 0755 \
+          $(DESTDIR)$(scriptdir_logwatch) \
+          $(DESTDIR)$(confdir_logwatch)
+	$(INSTALL) -m 0644 \
+          $(program) \
+          $(DESTDIR)$(scriptdir_logwatch)/$(program_logwatch)
+	$(INSTALL) -m 0644 \
+          $(program).conf \
+          $(DESTDIR)$(confdir_logwatch)/$(program_logwatch).conf
 	# removes taint mode (-T) to run under logwatch
-	perl -e 'while (<>) { $$.==1 and s/\s+-T$$//; print "$$_";}' -i $(DESTDIR)$(scriptdir_logwatch)/$(program_logwatch)
+	perl -e 'while (<>) { $$.==1 and s/\s+-T$$//; print "$$_";}' \
+             -i $(DESTDIR)$(scriptdir_logwatch)/$(program_logwatch)
 
 install-standalone:
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(scriptdir_standalone) $(DESTDIR)$(confdir_standalone) || exit 1;
-	$(INSTALL) -m 0755 $(program) $(DESTDIR)$(scriptdir_standalone)/$(program) || exit 1;
-	$(INSTALL) -m 0644 $(program).conf $(DESTDIR)$(confdir_standalone)/$(program).conf || exit 1;
-	$(INSTALL) -m 0644 $(program).1 $(DESTDIR)$(mandir_standalone)/$(program).1 || exit 1;
+	$(INSTALL) -d -m 0755 \
+          $(DESTDIR)$(scriptdir_standalone) \
+          $(DESTDIR)$(confdir_standalone) \
+          $(DESTDIR)$(mandir_standalone)
+	$(INSTALL) -m 0755 \
+          $(program) \
+          $(DESTDIR)$(scriptdir_standalone)/$(program)
+	$(INSTALL) -m 0644 \
+          $(program).conf \
+          $(DESTDIR)$(confdir_standalone)/$(program).conf
+	$(INSTALL) -m 0644 \
+          $(program).1 \
+          $(DESTDIR)$(mandir_standalone)/$(program).1
 
 install-all: install-logwatch install-standalone
 
 uninstall-logwatch:
-	-rm $(DESTDIR)$(scriptdir_logwatch)/$(program_logwatch) $(DESTDIR)$(confdir_logwatch)/$(program_logwatch).conf
+	rm -f $(DESTDIR)$(scriptdir_logwatch)/$(program_logwatch) \
+              $(DESTDIR)$(confdir_logwatch)/$(program_logwatch).conf
+	rm -rf $(DESTDIR)$(scriptdir_logwatch) \
+               $(DESTDIR)$(confdir_logwatch)
 
 uninstall-standalone:
-	-rm $(DESTDIR)$(scriptdir_standalone)/$(program) $(DESTDIR)$(confdir_standalone)/$(program).conf \
-            $(DESTDIR)$(mandir_standalone)/$(program).1
+	rm -f $(DESTDIR)$(scriptdir_standalone)/$(program) \
+              $(DESTDIR)$(confdir_standalone)/$(program).conf \
+              $(DESTDIR)$(mandir_standalone)/$(program).1
+	rm -rf $(DESTDIR)$(scriptdir_standalone) \
+               $(DESTDIR)$(confdir_standalone) \
+               $(DESTDIR)$(mandir_standalone)
 
 uninstall-all: uninstall-logwatch uninstall-standalone
 
@@ -54,5 +77,5 @@ release:
 	rel=$(program)-$$vers ; \
 	tar -cJf $${rel}.tar.xz --transform=s",^,$${rel}/," $(src) ;
 
-htmlpage:
-	groff -m mandoc -T ascii $(program).1 | man2html -t 'Man page: $(program)(1)' >| $(program).1.html;
+$(program).1.html: $(program).1
+	man2html $< > $@