diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-02 00:19:09 +0200 |
| commit | 56e847dae8f585254c6b336ea557bd75a0574711 (patch) | |
| tree | 7e775ea62e06caa505e7ad017e17bbc0800d8ab3 /Makefile.am | |
| parent | 62ceba5818d888041adbd466e8c67a8104bcf4fa (diff) | |
| parent | 67d85b3d5cf145a5bf0a1431d6052473b017daa9 (diff) | |
Merge branch 'master' of git://git.linux-ax25.org/pub/scm/ralf/ax25-tools
Conflicts:
ax25/axspawn.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 3215b0f..25f36bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = ax25 hdlcutil kiss 6pack netrom rose tcpip user_call yamdrv dmascc EXTRA_DIST = pathnames.h ax25-tools.spec INCLUDES = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \ - -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" + -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" AX25_SYSCONFDIR=@sysconfdir@/ax25/ AX25_LOCALSTATEDIR=@localstatedir@/ax25/ |