automake: bugfix: fix installation paths

* Install to $datadir/dahdi and not $datadir/dahdi-tools
* Install to $includedir/dahdi and not $includedir/dahdi-tools

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
This commit is contained in:
Oron Peled 2015-05-25 15:22:01 +00:00 committed by Tzafrir Cohen
parent b375bb80b8
commit af920cd079
No known key found for this signature in database
GPG Key ID: 8EFD4C2F0325A0CE
4 changed files with 5 additions and 3 deletions

View File

@ -71,7 +71,7 @@ libtonezone_la_SOURCES = \
zonedata.c \ zonedata.c \
tonezone.c \ tonezone.c \
version.c version.c
pkginclude_HEADERS = tonezone.h dahdiinclude_HEADERS = tonezone.h
libtonezone_la_CFLAGS = $(CFLAGS) -I$(srcdir) -DBUILDING_TONEZONE libtonezone_la_CFLAGS = $(CFLAGS) -I$(srcdir) -DBUILDING_TONEZONE
libtonezone_la_LDFLAGS = -version-info "$(LTZ_CURRENT):$(LTZ_REVISION):$(LTZ_AGE)" libtonezone_la_LDFLAGS = -version-info "$(LTZ_CURRENT):$(LTZ_REVISION):$(LTZ_AGE)"

View File

@ -36,6 +36,8 @@ fi
if test ${localstatedir} = '${prefix}/var'; then if test ${localstatedir} = '${prefix}/var'; then
localstatedir=/var localstatedir=/var
fi fi
AC_SUBST([dahditoolsdir], ['${datadir}/dahdi'])
AC_SUBST([dahdiincludedir], ['${includedir}/dahdi'])
AC_SUBST([udevrulesdir], '${sysconfdir}/udev/rules.d') AC_SUBST([udevrulesdir], '${sysconfdir}/udev/rules.d')

View File

@ -1,5 +1,5 @@
nobase_dist_pkgdata_SCRIPTS = \ nobase_dist_dahditools_SCRIPTS = \
dahdi_handle_device \ dahdi_handle_device \
dahdi_span_config \ dahdi_span_config \
dahdi_auto_assign_compat \ dahdi_auto_assign_compat \

View File

@ -52,7 +52,7 @@ perl_mans = $(perl_scripts:%=%.8)
endif endif
dist_pkgdata_SCRIPTS = xpp_fxloader astribank_hook waitfor_xpds dist_dahditools_SCRIPTS = xpp_fxloader astribank_hook waitfor_xpds
udevrulesdir = @udevrulesdir@ udevrulesdir = @udevrulesdir@
udevrules_DATA = xpp.rules udevrules_DATA = xpp.rules