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 /ax25/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 'ax25/Makefile.am')
| -rw-r--r-- | ax25/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ax25/Makefile.am b/ax25/Makefile.am index f5c0ebb..327510e 100644 --- a/ax25/Makefile.am +++ b/ax25/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = axgetput +SUBDIRS = axgetput etcfiles = ax25.profile ax25d.conf axspawn.conf rxecho.conf varfiles = mheard.dat @@ -24,18 +24,18 @@ LDADD = $(AX25_LIB) axspawn_LDADD = $(AX25_LIB) $(UTIL_LIB) INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \ - -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" + -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" AX25_SYSCONFDIR=$(sysconfdir)/ax25/ AX25_LOCALSTATEDIR=$(localstatedir)/ax25/ -man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 \ +dist_man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 \ ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 \ mheard.1 mheardd.8 rxecho.8 -EXTRA_DIST = $(man_MANS) $(etcfiles) $(varfiles) +EXTRA_DIST = $(etcfiles) $(varfiles) ax25d_SOURCES = ax25d.c axctl_SOURCES = axctl.c |