database: 0 sized .cvd files were still installed, because exit 0 didn't stop
the entire rule. fixed
git-svn: trunk@4042
... | ... |
@@ -358,6 +358,21 @@ uninstall-binSCRIPTS: |
358 | 358 |
rm -f "$(DESTDIR)$(bindir)/$$f"; \ |
359 | 359 |
done |
360 | 360 |
|
361 |
+installcheck-binSCRIPTS: $(bin_SCRIPTS) |
|
362 |
+ bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \ |
|
363 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
364 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
365 |
+ esac; \ |
|
366 |
+ f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ |
|
367 |
+ for opt in --help --version; do \ |
|
368 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
369 |
+ 2>c$${pid}_.err </dev/null \ |
|
370 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
371 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
372 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
373 |
+ done; \ |
|
374 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
375 |
+ |
|
361 | 376 |
mostlyclean-libtool: |
362 | 377 |
-rm -f *.lo |
363 | 378 |
|
... | ... |
@@ -731,7 +746,7 @@ install-pdf: install-pdf-recursive |
731 | 731 |
|
732 | 732 |
install-ps: install-ps-recursive |
733 | 733 |
|
734 |
-installcheck-am: |
|
734 |
+installcheck-am: installcheck-binSCRIPTS |
|
735 | 735 |
|
736 | 736 |
maintainer-clean: maintainer-clean-recursive |
737 | 737 |
-rm -f $(am__CONFIG_DISTCLEAN_FILES) |
... | ... |
@@ -768,11 +783,11 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA |
768 | 768 |
install-html-am install-info install-info-am install-man \ |
769 | 769 |
install-pdf install-pdf-am install-pkgconfigDATA install-ps \ |
770 | 770 |
install-ps-am install-strip installcheck installcheck-am \ |
771 |
- installdirs installdirs-am maintainer-clean \ |
|
772 |
- maintainer-clean-generic mostlyclean mostlyclean-generic \ |
|
773 |
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
|
774 |
- uninstall uninstall-am uninstall-binSCRIPTS \ |
|
775 |
- uninstall-pkgconfigDATA |
|
771 |
+ installcheck-binSCRIPTS installdirs installdirs-am \ |
|
772 |
+ maintainer-clean maintainer-clean-generic mostlyclean \ |
|
773 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
774 |
+ tags tags-recursive uninstall uninstall-am \ |
|
775 |
+ uninstall-binSCRIPTS uninstall-pkgconfigDATA |
|
776 | 776 |
|
777 | 777 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
778 | 778 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -312,6 +312,22 @@ clean-sbinPROGRAMS: |
312 | 312 |
echo " rm -f $$p $$f"; \ |
313 | 313 |
rm -f $$p $$f ; \ |
314 | 314 |
done |
315 |
+ |
|
316 |
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS) |
|
317 |
+ bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \ |
|
318 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
319 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
320 |
+ esac; \ |
|
321 |
+ f=`echo "$$p" | \ |
|
322 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
323 |
+ for opt in --help --version; do \ |
|
324 |
+ if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \ |
|
325 |
+ 2>c$${pid}_.err </dev/null \ |
|
326 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
327 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
328 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
329 |
+ done; \ |
|
330 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
315 | 331 |
clamav-milter$(EXEEXT): $(clamav_milter_OBJECTS) $(clamav_milter_DEPENDENCIES) |
316 | 332 |
@rm -f clamav-milter$(EXEEXT) |
317 | 333 |
$(LINK) $(clamav_milter_OBJECTS) $(clamav_milter_LDADD) $(LIBS) |
... | ... |
@@ -612,7 +628,7 @@ install-pdf: install-pdf-am |
612 | 612 |
|
613 | 613 |
install-ps: install-ps-am |
614 | 614 |
|
615 |
-installcheck-am: |
|
615 |
+installcheck-am: installcheck-sbinPROGRAMS |
|
616 | 616 |
|
617 | 617 |
maintainer-clean: maintainer-clean-am |
618 | 618 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -647,11 +663,11 @@ uninstall-man: uninstall-man8 |
647 | 647 |
install-html-am install-info install-info-am install-man \ |
648 | 648 |
install-man8 install-pdf install-pdf-am install-ps \ |
649 | 649 |
install-ps-am install-sbinPROGRAMS install-strip installcheck \ |
650 |
- installcheck-am installdirs maintainer-clean \ |
|
651 |
- maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
652 |
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
653 |
- tags uninstall uninstall-am uninstall-man uninstall-man8 \ |
|
654 |
- uninstall-sbinPROGRAMS |
|
650 |
+ installcheck-am installcheck-sbinPROGRAMS installdirs \ |
|
651 |
+ maintainer-clean maintainer-clean-generic mostlyclean \ |
|
652 |
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
653 |
+ pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \ |
|
654 |
+ uninstall-man8 uninstall-sbinPROGRAMS |
|
655 | 655 |
|
656 | 656 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
657 | 657 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -30,3 +30,6 @@ clamconf_SOURCES = \ |
30 | 30 |
DEFS = @DEFS@ -DCL_NOTHREADS |
31 | 31 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
32 | 32 |
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@ |
33 |
+ |
|
34 |
+# it supports only --help |
|
35 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamconf |
... | ... |
@@ -230,6 +230,9 @@ clamconf_SOURCES = \ |
230 | 230 |
clamconf.c |
231 | 231 |
|
232 | 232 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
233 |
+ |
|
234 |
+# it supports only --help |
|
235 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamconf |
|
233 | 236 |
all: all-am |
234 | 237 |
|
235 | 238 |
.SUFFIXES: |
... | ... |
@@ -291,6 +294,22 @@ clean-binPROGRAMS: |
291 | 291 |
echo " rm -f $$p $$f"; \ |
292 | 292 |
rm -f $$p $$f ; \ |
293 | 293 |
done |
294 |
+ |
|
295 |
+installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
296 |
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
297 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
298 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
299 |
+ esac; \ |
|
300 |
+ f=`echo "$$p" | \ |
|
301 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
302 |
+ for opt in --help --version; do \ |
|
303 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
304 |
+ 2>c$${pid}_.err </dev/null \ |
|
305 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
306 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
307 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
308 |
+ done; \ |
|
309 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
294 | 310 |
clamconf$(EXEEXT): $(clamconf_OBJECTS) $(clamconf_DEPENDENCIES) |
295 | 311 |
@rm -f clamconf$(EXEEXT) |
296 | 312 |
$(LINK) $(clamconf_OBJECTS) $(clamconf_LDADD) $(LIBS) |
... | ... |
@@ -515,7 +534,7 @@ install-pdf: install-pdf-am |
515 | 515 |
|
516 | 516 |
install-ps: install-ps-am |
517 | 517 |
|
518 |
-installcheck-am: |
|
518 |
+installcheck-am: installcheck-binPROGRAMS |
|
519 | 519 |
|
520 | 520 |
maintainer-clean: maintainer-clean-am |
521 | 521 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -547,11 +566,11 @@ uninstall-am: uninstall-binPROGRAMS |
547 | 547 |
install-dvi-am install-exec install-exec-am install-html \ |
548 | 548 |
install-html-am install-info install-info-am install-man \ |
549 | 549 |
install-pdf install-pdf-am install-ps install-ps-am \ |
550 |
- install-strip installcheck installcheck-am installdirs \ |
|
551 |
- maintainer-clean maintainer-clean-generic mostlyclean \ |
|
552 |
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
553 |
- pdf pdf-am ps ps-am tags uninstall uninstall-am \ |
|
554 |
- uninstall-binPROGRAMS |
|
550 |
+ install-strip installcheck installcheck-am \ |
|
551 |
+ installcheck-binPROGRAMS installdirs maintainer-clean \ |
|
552 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
553 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
554 |
+ tags uninstall uninstall-am uninstall-binPROGRAMS |
|
555 | 555 |
|
556 | 556 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
557 | 557 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -62,3 +62,7 @@ endif |
62 | 62 |
|
63 | 63 |
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@ |
64 | 64 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
65 |
+ |
|
66 |
+# it does support --help and --version but with the default config file |
|
67 |
+# it outputs an error message which tells us to edit the config files |
|
68 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamd$(EXEEXT) |
... | ... |
@@ -279,6 +279,10 @@ top_srcdir = @top_srcdir@ |
279 | 279 |
@BUILD_CLAMD_TRUE@ shared.h |
280 | 280 |
|
281 | 281 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
282 |
+ |
|
283 |
+# it does support --help and --version but with the default config file |
|
284 |
+# it outputs an error message which tells us to edit the config files |
|
285 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamd$(EXEEXT) |
|
282 | 286 |
all: all-am |
283 | 287 |
|
284 | 288 |
.SUFFIXES: |
... | ... |
@@ -340,6 +344,22 @@ clean-sbinPROGRAMS: |
340 | 340 |
echo " rm -f $$p $$f"; \ |
341 | 341 |
rm -f $$p $$f ; \ |
342 | 342 |
done |
343 |
+ |
|
344 |
+installcheck-sbinPROGRAMS: $(sbin_PROGRAMS) |
|
345 |
+ bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \ |
|
346 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
347 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
348 |
+ esac; \ |
|
349 |
+ f=`echo "$$p" | \ |
|
350 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
351 |
+ for opt in --help --version; do \ |
|
352 |
+ if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \ |
|
353 |
+ 2>c$${pid}_.err </dev/null \ |
|
354 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
355 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
356 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
357 |
+ done; \ |
|
358 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
343 | 359 |
clamd$(EXEEXT): $(clamd_OBJECTS) $(clamd_DEPENDENCIES) |
344 | 360 |
@rm -f clamd$(EXEEXT) |
345 | 361 |
$(LINK) $(clamd_OBJECTS) $(clamd_LDADD) $(LIBS) |
... | ... |
@@ -620,7 +640,7 @@ install-pdf: install-pdf-am |
620 | 620 |
|
621 | 621 |
install-ps: install-ps-am |
622 | 622 |
|
623 |
-installcheck-am: |
|
623 |
+installcheck-am: installcheck-sbinPROGRAMS |
|
624 | 624 |
|
625 | 625 |
maintainer-clean: maintainer-clean-am |
626 | 626 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -653,10 +673,11 @@ uninstall-am: uninstall-sbinPROGRAMS |
653 | 653 |
install-html-am install-info install-info-am install-man \ |
654 | 654 |
install-pdf install-pdf-am install-ps install-ps-am \ |
655 | 655 |
install-sbinPROGRAMS install-strip installcheck \ |
656 |
- installcheck-am installdirs maintainer-clean \ |
|
657 |
- maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
658 |
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
659 |
- tags uninstall uninstall-am uninstall-sbinPROGRAMS |
|
656 |
+ installcheck-am installcheck-sbinPROGRAMS installdirs \ |
|
657 |
+ maintainer-clean maintainer-clean-generic mostlyclean \ |
|
658 |
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
659 |
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ |
|
660 |
+ uninstall-sbinPROGRAMS |
|
660 | 661 |
|
661 | 662 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
662 | 663 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -41,3 +41,5 @@ endif |
41 | 41 |
DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV |
42 | 42 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
43 | 43 |
LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @FRESHCLAM_LIBS@ |
44 |
+ |
|
45 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT) |
... | ... |
@@ -246,6 +246,7 @@ top_srcdir = @top_srcdir@ |
246 | 246 |
@BUILD_CLAMD_TRUE@ defaults.h |
247 | 247 |
|
248 | 248 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
249 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT) |
|
249 | 250 |
all: all-am |
250 | 251 |
|
251 | 252 |
.SUFFIXES: |
... | ... |
@@ -307,6 +308,22 @@ clean-binPROGRAMS: |
307 | 307 |
echo " rm -f $$p $$f"; \ |
308 | 308 |
rm -f $$p $$f ; \ |
309 | 309 |
done |
310 |
+ |
|
311 |
+installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
312 |
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
313 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
314 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
315 |
+ esac; \ |
|
316 |
+ f=`echo "$$p" | \ |
|
317 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
318 |
+ for opt in --help --version; do \ |
|
319 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
320 |
+ 2>c$${pid}_.err </dev/null \ |
|
321 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
322 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
323 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
324 |
+ done; \ |
|
325 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
310 | 326 |
clamdscan$(EXEEXT): $(clamdscan_OBJECTS) $(clamdscan_DEPENDENCIES) |
311 | 327 |
@rm -f clamdscan$(EXEEXT) |
312 | 328 |
$(LINK) $(clamdscan_OBJECTS) $(clamdscan_LDADD) $(LIBS) |
... | ... |
@@ -562,7 +579,7 @@ install-pdf: install-pdf-am |
562 | 562 |
|
563 | 563 |
install-ps: install-ps-am |
564 | 564 |
|
565 |
-installcheck-am: |
|
565 |
+installcheck-am: installcheck-binPROGRAMS |
|
566 | 566 |
|
567 | 567 |
maintainer-clean: maintainer-clean-am |
568 | 568 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -594,11 +611,11 @@ uninstall-am: uninstall-binPROGRAMS |
594 | 594 |
install-dvi-am install-exec install-exec-am install-html \ |
595 | 595 |
install-html-am install-info install-info-am install-man \ |
596 | 596 |
install-pdf install-pdf-am install-ps install-ps-am \ |
597 |
- install-strip installcheck installcheck-am installdirs \ |
|
598 |
- maintainer-clean maintainer-clean-generic mostlyclean \ |
|
599 |
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
600 |
- pdf pdf-am ps ps-am tags uninstall uninstall-am \ |
|
601 |
- uninstall-binPROGRAMS |
|
597 |
+ install-strip installcheck installcheck-am \ |
|
598 |
+ installcheck-binPROGRAMS installdirs maintainer-clean \ |
|
599 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
600 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
601 |
+ tags uninstall uninstall-am uninstall-binPROGRAMS |
|
602 | 602 |
|
603 | 603 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
604 | 604 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -303,6 +303,22 @@ clean-binPROGRAMS: |
303 | 303 |
echo " rm -f $$p $$f"; \ |
304 | 304 |
rm -f $$p $$f ; \ |
305 | 305 |
done |
306 |
+ |
|
307 |
+installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
308 |
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
309 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
310 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
311 |
+ esac; \ |
|
312 |
+ f=`echo "$$p" | \ |
|
313 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
314 |
+ for opt in --help --version; do \ |
|
315 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
316 |
+ 2>c$${pid}_.err </dev/null \ |
|
317 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
318 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
319 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
320 |
+ done; \ |
|
321 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
306 | 322 |
clamscan$(EXEEXT): $(clamscan_OBJECTS) $(clamscan_DEPENDENCIES) |
307 | 323 |
@rm -f clamscan$(EXEEXT) |
308 | 324 |
$(LINK) $(clamscan_OBJECTS) $(clamscan_LDADD) $(LIBS) |
... | ... |
@@ -559,7 +575,7 @@ install-pdf: install-pdf-am |
559 | 559 |
|
560 | 560 |
install-ps: install-ps-am |
561 | 561 |
|
562 |
-installcheck-am: |
|
562 |
+installcheck-am: installcheck-binPROGRAMS |
|
563 | 563 |
|
564 | 564 |
maintainer-clean: maintainer-clean-am |
565 | 565 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -591,11 +607,11 @@ uninstall-am: uninstall-binPROGRAMS |
591 | 591 |
install-dvi-am install-exec install-exec-am install-html \ |
592 | 592 |
install-html-am install-info install-info-am install-man \ |
593 | 593 |
install-pdf install-pdf-am install-ps install-ps-am \ |
594 |
- install-strip installcheck installcheck-am installdirs \ |
|
595 |
- maintainer-clean maintainer-clean-generic mostlyclean \ |
|
596 |
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
597 |
- pdf pdf-am ps ps-am tags uninstall uninstall-am \ |
|
598 |
- uninstall-binPROGRAMS |
|
594 |
+ install-strip installcheck installcheck-am \ |
|
595 |
+ installcheck-binPROGRAMS installdirs maintainer-clean \ |
|
596 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
597 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
598 |
+ tags uninstall uninstall-am uninstall-binPROGRAMS |
|
599 | 599 |
|
600 | 600 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
601 | 601 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -32,7 +32,7 @@ AC_CONFIG_MACRO_DIR([m4]) |
32 | 32 |
AC_CREATE_TARGET_H([target.h]) |
33 | 33 |
|
34 | 34 |
dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings |
35 |
-AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror foreign dist-bzip2 no-define]) |
|
35 |
+AM_INIT_AUTOMAKE([-Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define]) |
|
36 | 36 |
|
37 | 37 |
dnl we told automake to not define these, since we want to include |
38 | 38 |
dnl the date in the version |
... | ... |
@@ -23,11 +23,11 @@ CLAMAVUSER = @CLAMAVUSER@ |
23 | 23 |
CLAMAVGROUP = @CLAMAVGROUP@ |
24 | 24 |
|
25 | 25 |
install-data-local: |
26 |
- @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0 |
|
27 |
- $(mkinstalldirs) $(DESTDIR)$(DBINST) |
|
28 |
- @test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) |
|
29 |
- @test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) |
|
30 |
- @if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \ |
|
26 |
+ @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0;\ |
|
27 |
+ $(mkinstalldirs) $(DESTDIR)$(DBINST);\ |
|
28 |
+ test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\ |
|
29 |
+ test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\ |
|
30 |
+ if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \ |
|
31 | 31 |
chmod 775 $(DESTDIR)$(DBINST); \ |
32 | 32 |
chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \ |
33 | 33 |
chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \ |
... | ... |
@@ -369,11 +369,11 @@ uninstall-am: |
369 | 369 |
|
370 | 370 |
|
371 | 371 |
install-data-local: |
372 |
- @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0 |
|
373 |
- $(mkinstalldirs) $(DESTDIR)$(DBINST) |
|
374 |
- @test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) |
|
375 |
- @test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) |
|
376 |
- @if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \ |
|
372 |
+ @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0;\ |
|
373 |
+ $(mkinstalldirs) $(DESTDIR)$(DBINST);\ |
|
374 |
+ test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST);\ |
|
375 |
+ test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST);\ |
|
376 |
+ if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \ |
|
377 | 377 |
chmod 775 $(DESTDIR)$(DBINST); \ |
378 | 378 |
chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \ |
379 | 379 |
chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \ |
... | ... |
@@ -52,3 +52,5 @@ freshclam_SOURCES = \ |
52 | 52 |
DEFS = @DEFS@ -DCL_NOTHREADS |
53 | 53 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
54 | 54 |
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@ |
55 |
+ |
|
56 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT) |
... | ... |
@@ -256,6 +256,7 @@ freshclam_SOURCES = \ |
256 | 256 |
mirman.h |
257 | 257 |
|
258 | 258 |
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav |
259 |
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT) |
|
259 | 260 |
all: all-am |
260 | 261 |
|
261 | 262 |
.SUFFIXES: |
... | ... |
@@ -317,6 +318,22 @@ clean-binPROGRAMS: |
317 | 317 |
echo " rm -f $$p $$f"; \ |
318 | 318 |
rm -f $$p $$f ; \ |
319 | 319 |
done |
320 |
+ |
|
321 |
+installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
322 |
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
323 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
324 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
325 |
+ esac; \ |
|
326 |
+ f=`echo "$$p" | \ |
|
327 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
328 |
+ for opt in --help --version; do \ |
|
329 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
330 |
+ 2>c$${pid}_.err </dev/null \ |
|
331 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
332 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
333 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
334 |
+ done; \ |
|
335 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
320 | 336 |
freshclam$(EXEEXT): $(freshclam_OBJECTS) $(freshclam_DEPENDENCIES) |
321 | 337 |
@rm -f freshclam$(EXEEXT) |
322 | 338 |
$(LINK) $(freshclam_OBJECTS) $(freshclam_LDADD) $(LIBS) |
... | ... |
@@ -622,7 +639,7 @@ install-pdf: install-pdf-am |
622 | 622 |
|
623 | 623 |
install-ps: install-ps-am |
624 | 624 |
|
625 |
-installcheck-am: |
|
625 |
+installcheck-am: installcheck-binPROGRAMS |
|
626 | 626 |
|
627 | 627 |
maintainer-clean: maintainer-clean-am |
628 | 628 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -654,11 +671,11 @@ uninstall-am: uninstall-binPROGRAMS |
654 | 654 |
install-dvi-am install-exec install-exec-am install-html \ |
655 | 655 |
install-html-am install-info install-info-am install-man \ |
656 | 656 |
install-pdf install-pdf-am install-ps install-ps-am \ |
657 |
- install-strip installcheck installcheck-am installdirs \ |
|
658 |
- maintainer-clean maintainer-clean-generic mostlyclean \ |
|
659 |
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
660 |
- pdf pdf-am ps ps-am tags uninstall uninstall-am \ |
|
661 |
- uninstall-binPROGRAMS |
|
657 |
+ install-strip installcheck installcheck-am \ |
|
658 |
+ installcheck-binPROGRAMS installdirs maintainer-clean \ |
|
659 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
660 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
661 |
+ tags uninstall uninstall-am uninstall-binPROGRAMS |
|
662 | 662 |
|
663 | 663 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
664 | 664 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -306,6 +306,22 @@ clean-binPROGRAMS: |
306 | 306 |
echo " rm -f $$p $$f"; \ |
307 | 307 |
rm -f $$p $$f ; \ |
308 | 308 |
done |
309 |
+ |
|
310 |
+installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
311 |
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
312 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
313 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
314 |
+ esac; \ |
|
315 |
+ f=`echo "$$p" | \ |
|
316 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
317 |
+ for opt in --help --version; do \ |
|
318 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
319 |
+ 2>c$${pid}_.err </dev/null \ |
|
320 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
321 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
322 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
323 |
+ done; \ |
|
324 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
309 | 325 |
sigtool$(EXEEXT): $(sigtool_OBJECTS) $(sigtool_DEPENDENCIES) |
310 | 326 |
@rm -f sigtool$(EXEEXT) |
311 | 327 |
$(LINK) $(sigtool_OBJECTS) $(sigtool_LDADD) $(LIBS) |
... | ... |
@@ -606,7 +622,7 @@ install-pdf: install-pdf-am |
606 | 606 |
|
607 | 607 |
install-ps: install-ps-am |
608 | 608 |
|
609 |
-installcheck-am: |
|
609 |
+installcheck-am: installcheck-binPROGRAMS |
|
610 | 610 |
|
611 | 611 |
maintainer-clean: maintainer-clean-am |
612 | 612 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -638,11 +654,11 @@ uninstall-am: uninstall-binPROGRAMS |
638 | 638 |
install-dvi-am install-exec install-exec-am install-html \ |
639 | 639 |
install-html-am install-info install-info-am install-man \ |
640 | 640 |
install-pdf install-pdf-am install-ps install-ps-am \ |
641 |
- install-strip installcheck installcheck-am installdirs \ |
|
642 |
- maintainer-clean maintainer-clean-generic mostlyclean \ |
|
643 |
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ |
|
644 |
- pdf pdf-am ps ps-am tags uninstall uninstall-am \ |
|
645 |
- uninstall-binPROGRAMS |
|
641 |
+ install-strip installcheck installcheck-am \ |
|
642 |
+ installcheck-binPROGRAMS installdirs maintainer-clean \ |
|
643 |
+ maintainer-clean-generic mostlyclean mostlyclean-compile \ |
|
644 |
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
|
645 |
+ tags uninstall uninstall-am uninstall-binPROGRAMS |
|
646 | 646 |
|
647 | 647 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
648 | 648 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
... | ... |
@@ -296,6 +296,22 @@ clean-binPROGRAMS: |
296 | 296 |
rm -f $$p $$f ; \ |
297 | 297 |
done |
298 | 298 |
|
299 |
+installcheck-binPROGRAMS: $(bin_PROGRAMS) |
|
300 |
+ bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ |
|
301 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
302 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
303 |
+ esac; \ |
|
304 |
+ f=`echo "$$p" | \ |
|
305 |
+ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ |
|
306 |
+ for opt in --help --version; do \ |
|
307 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
308 |
+ 2>c$${pid}_.err </dev/null \ |
|
309 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
310 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
311 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
312 |
+ done; \ |
|
313 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
314 |
+ |
|
299 | 315 |
clean-checkPROGRAMS: |
300 | 316 |
@list='$(check_PROGRAMS)'; for p in $$list; do \ |
301 | 317 |
f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ |
... | ... |
@@ -325,6 +341,21 @@ uninstall-dist_binSCRIPTS: |
325 | 325 |
rm -f "$(DESTDIR)$(bindir)/$$f"; \ |
326 | 326 |
done |
327 | 327 |
|
328 |
+installcheck-dist_binSCRIPTS: $(dist_bin_SCRIPTS) |
|
329 |
+ bad=0; pid=$$$$; list="$(dist_bin_SCRIPTS)"; for p in $$list; do \ |
|
330 |
+ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ |
|
331 |
+ *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ |
|
332 |
+ esac; \ |
|
333 |
+ f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \ |
|
334 |
+ for opt in --help --version; do \ |
|
335 |
+ if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ |
|
336 |
+ 2>c$${pid}_.err </dev/null \ |
|
337 |
+ && test -n "`cat c$${pid}_.out`" \ |
|
338 |
+ && test -z "`cat c$${pid}_.err`"; then :; \ |
|
339 |
+ else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ |
|
340 |
+ done; \ |
|
341 |
+ done; rm -f c$${pid}_.???; exit $$bad |
|
342 |
+ |
|
328 | 343 |
mostlyclean-compile: |
329 | 344 |
-rm -f *.$(OBJEXT) |
330 | 345 |
|
... | ... |
@@ -652,7 +683,7 @@ install-pdf: install-pdf-am |
652 | 652 |
|
653 | 653 |
install-ps: install-ps-am |
654 | 654 |
|
655 |
-installcheck-am: |
|
655 |
+installcheck-am: installcheck-binPROGRAMS installcheck-dist_binSCRIPTS |
|
656 | 656 |
|
657 | 657 |
maintainer-clean: maintainer-clean-am |
658 | 658 |
-rm -rf ./$(DEPDIR) |
... | ... |
@@ -686,7 +717,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS |
686 | 686 |
install-exec install-exec-am install-html install-html-am \ |
687 | 687 |
install-info install-info-am install-man install-pdf \ |
688 | 688 |
install-pdf-am install-ps install-ps-am install-strip \ |
689 |
- installcheck installcheck-am installdirs maintainer-clean \ |
|
689 |
+ installcheck installcheck-am installcheck-binPROGRAMS \ |
|
690 |
+ installcheck-dist_binSCRIPTS installdirs maintainer-clean \ |
|
690 | 691 |
maintainer-clean-generic mostlyclean mostlyclean-compile \ |
691 | 692 |
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
692 | 693 |
tags uninstall uninstall-am uninstall-binPROGRAMS \ |