From: Andrew Deason Date: Wed, 16 Feb 2011 03:23:06 +0000 (-0600) Subject: aklog: Do not include XCFLAGS twice X-Git-Tag: upstream/1.8.0_pre1^2~4077 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b13a5a527d87c7b9a73fd92eb7633e1796e3337f;p=packages%2Fo%2Fopenafs.git aklog: Do not include XCFLAGS twice In aklog, we set MODULE_CFLAGS to XCFLAGS and some other things. However, when using AFS_LDRULE or AFS_CCRULE, CFLAGS will contain MT_CFLAGS, which contains XCFLAGS. The end result is that the contents of XCFLAGS appear twice in the compilation invocation, breaking some platforms like HP-UX where the order of XCFLAGS relative to other things is a bit fragile. Fix this by removing XCFLAGS from the MODULE_CFLAGS definition. Change-Id: I5eef9764d758885a995269edc5bef91ff06db8b5 Reviewed-on: http://gerrit.openafs.org/3960 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in index 76d8d5653..e7f3c8f7e 100644 --- a/src/aklog/Makefile.in +++ b/src/aklog/Makefile.in @@ -11,7 +11,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -MODULE_CFLAGS=@XCFLAGS@ @KRB5_CPPFLAGS@ -DALLOW_REGISTER +MODULE_CFLAGS=@KRB5_CPPFLAGS@ -DALLOW_REGISTER AKLIBS= ${LIBS} @KRB5_LDFLAGS@ @KRB5_LIBS@ AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \