Browse code
Correction to Makefile.am and autoreconf to immediately evaluate variable and avoid recursive behavior.
Micah Snyder authored on 2018/06/28 03:41:30Showing 2 changed files
| ... | ... |
@@ -158,7 +158,7 @@ endif |
| 158 | 158 |
|
| 159 | 159 |
if USE_INTERNAL_MSPACK |
| 160 | 160 |
SUBDIRS += libmspack-0.5alpha |
| 161 |
-libclamav_la_CFLAGS = -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack $(libclamav_la_CFLAGS) |
|
| 161 |
+libclamav_la_CFLAGS := -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack $(libclamav_la_CFLAGS) |
|
| 162 | 162 |
libclamav_la_LIBADD += libmspack-0.5alpha/libclammspack.la |
| 163 | 163 |
else |
| 164 | 164 |
libclamav_la_CFLAGS += $(LIBMSPACK_CFLAGS) |
| ... | ... |
@@ -1055,7 +1055,7 @@ libclamav_la_CFLAGS = $(AM_CFLAGS) $(XML_CPPFLAGS) $(YARA_CFLAGS) \ |
| 1055 | 1055 |
-DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ \ |
| 1056 | 1056 |
@SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ \ |
| 1057 | 1057 |
@PCRE_CPPFLAGS@ $(am__append_10) |
| 1058 |
-@USE_INTERNAL_MSPACK_TRUE@libclamav_la_CFLAGS = -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack \ |
|
| 1058 |
+@USE_INTERNAL_MSPACK_TRUE@libclamav_la_CFLAGS := -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack \ |
|
| 1059 | 1059 |
@USE_INTERNAL_MSPACK_TRUE@ $(libclamav_la_CFLAGS) \ |
| 1060 | 1060 |
@USE_INTERNAL_MSPACK_TRUE@ $(am__append_10) |
| 1061 | 1061 |
libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \ |