diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-10-17 21:51:21 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-10-17 21:51:21 +0100 |
| commit | 7d5fd5fcd02564226abb067b0a47da637ca653fc (patch) | |
| tree | 1598bcf1bc78146629bab5cd67615e147dd57d99 | |
| parent | f6c49cecc18df02579473095818935e8271fbfbc (diff) | |
| download | rtmux-7d5fd5fcd02564226abb067b0a47da637ca653fc.tar.gz rtmux-7d5fd5fcd02564226abb067b0a47da637ca653fc.tar.bz2 rtmux-7d5fd5fcd02564226abb067b0a47da637ca653fc.zip | |
Preserve existing AM_CPPFLAGS and AM_LDFLAGS values.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 6d1bceb5..b56e9280 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ dist-hook: grep "^#found_debug=" configure # Preprocessor flags. -AM_CPPFLAGS = @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\"" +AM_CPPFLAGS += @XOPEN_DEFINES@ -DTMUX_CONF="\"$(sysconfdir)/tmux.conf\"" # glibc as usual does things ass-backwards and hides useful things by default, # so everyone has to add this. diff --git a/configure.ac b/configure.ac index 4cc5fcfc..f7a2008d 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ AC_ARG_ENABLE( ) if test "x$enable_static" = xyes; then test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static" - AM_LDFLAGS="-static" + AM_LDFLAGS="$AM_LDFLAGS -static" fi # Is this gcc? |