Browse code
database/Makefile.am: add check for .cld files (bb#1088)
| ... | ... |
@@ -1,3 +1,7 @@ |
| 1 |
+Mon Jul 28 12:50:54 CEST 2008 (tk) |
|
| 2 |
+---------------------------------- |
|
| 3 |
+ * database/Makefile.am: add check for .cld files (bb#1088) |
|
| 4 |
+ |
|
| 1 | 5 |
Sun Jul 27 23:18:47 CEST 2008 (acab) |
| 2 | 6 |
------------------------------------ |
| 3 | 7 |
* misc fixes: add some missing checks for pthread api calls (bb#384) |
| ... | ... |
@@ -15,8 +15,7 @@ |
| 15 | 15 |
# |
| 16 | 16 |
# You should have received a copy of the GNU General Public License |
| 17 | 17 |
# along with this program; if not, write to the Free Software |
| 18 |
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
|
| 19 |
-# MA 02110-1301, USA. |
|
| 18 |
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
| 20 | 19 |
|
| 21 | 20 |
EXTRA_DIST = main.cvd daily.cvd |
| 22 | 21 |
DBINST = @DBDIR@ |
| ... | ... |
@@ -24,18 +23,18 @@ CLAMAVUSER = @CLAMAVUSER@ |
| 24 | 24 |
CLAMAVGROUP = @CLAMAVGROUP@ |
| 25 | 25 |
|
| 26 | 26 |
install-data-local: |
| 27 |
+ @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0 |
|
| 27 | 28 |
$(mkinstalldirs) $(DESTDIR)$(DBINST) |
| 28 |
-# @test -f $(DESTDIR)$(DBINST)/main.cvd || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) |
|
| 29 |
-# @test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) |
|
| 29 |
+ @test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) |
|
| 30 |
+ @test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) |
|
| 30 | 31 |
@if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
|
| 31 | 32 |
chmod 775 $(DESTDIR)$(DBINST); \ |
| 32 | 33 |
chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \
|
| 33 | 34 |
chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \
|
| 34 |
-fi |
|
| 35 |
-# chmod 664 $(DESTDIR)$(DBINST)/main.cvd; \ |
|
| 36 |
-# chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; \
|
|
| 37 |
-# chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; \
|
|
| 38 |
-# chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; \ |
|
| 39 |
-# chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; \
|
|
| 40 |
-# chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; \
|
|
| 41 |
-# fi |
|
| 35 |
+ if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\ |
|
| 36 |
+ if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\
|
|
| 37 |
+ if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\
|
|
| 38 |
+ if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\ |
|
| 39 |
+ if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
|
|
| 40 |
+ if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
|
|
| 41 |
+ fi |
| ... | ... |
@@ -31,8 +31,7 @@ |
| 31 | 31 |
# |
| 32 | 32 |
# You should have received a copy of the GNU General Public License |
| 33 | 33 |
# along with this program; if not, write to the Free Software |
| 34 |
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, |
|
| 35 |
-# MA 02110-1301, USA. |
|
| 34 |
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
| 36 | 35 |
VPATH = @srcdir@ |
| 37 | 36 |
pkgdatadir = $(datadir)/@PACKAGE@ |
| 38 | 37 |
pkglibdir = $(libdir)/@PACKAGE@ |
| ... | ... |
@@ -370,21 +369,21 @@ uninstall-am: |
| 370 | 370 |
|
| 371 | 371 |
|
| 372 | 372 |
install-data-local: |
| 373 |
+ @test -s $(srcdir)/main.cvd -a -s $(srcdir)/daily.cvd || exit 0 |
|
| 373 | 374 |
$(mkinstalldirs) $(DESTDIR)$(DBINST) |
| 374 |
-# @test -f $(DESTDIR)$(DBINST)/main.cvd || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) |
|
| 375 |
-# @test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) |
|
| 375 |
+ @test -f $(DESTDIR)$(DBINST)/main.cvd || test -f $(DESTDIR)$(DBINST)/main.cld || $(INSTALL_DATA) $(srcdir)/main.cvd $(DESTDIR)$(DBINST) |
|
| 376 |
+ @test -f $(DESTDIR)$(DBINST)/daily.cvd || test -f $(DESTDIR)$(DBINST)/daily.cld || $(INSTALL_DATA) $(srcdir)/daily.cvd $(DESTDIR)$(DBINST) |
|
| 376 | 377 |
@if test `id|sed -e 's/^.[^(]*(\([^)]*\)).*/\1/'` = "root" && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
|
| 377 | 378 |
chmod 775 $(DESTDIR)$(DBINST); \ |
| 378 | 379 |
chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \
|
| 379 | 380 |
chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST); \
|
| 380 |
-fi |
|
| 381 |
-# chmod 664 $(DESTDIR)$(DBINST)/main.cvd; \ |
|
| 382 |
-# chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; \
|
|
| 383 |
-# chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; \
|
|
| 384 |
-# chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; \ |
|
| 385 |
-# chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; \
|
|
| 386 |
-# chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; \
|
|
| 387 |
-# fi |
|
| 381 |
+ if test -f $(DESTDIR)$(DBINST)/main.cvd; then chmod 664 $(DESTDIR)$(DBINST)/main.cvd; fi;\ |
|
| 382 |
+ if test -f $(DESTDIR)$(DBINST)/main.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/main.cvd; fi;\
|
|
| 383 |
+ if test -f $(DESTDIR)$(DBINST)/main.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/main.cvd; fi;\
|
|
| 384 |
+ if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chmod 664 $(DESTDIR)$(DBINST)/daily.cvd; fi;\ |
|
| 385 |
+ if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chown ${CLAMAVUSER} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
|
|
| 386 |
+ if test -f $(DESTDIR)$(DBINST)/daily.cvd; then chgrp ${CLAMAVGROUP} $(DESTDIR)$(DBINST)/daily.cvd; fi;\
|
|
| 387 |
+ fi |
|
| 388 | 388 |
# Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 389 | 389 |
# Otherwise a system limit (for SysV at least) may be exceeded. |
| 390 | 390 |
.NOEXPORT: |