[Pkg-voip-commits] [dahdi-tools] 242/285: automake: bugfix: fix installation paths

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-tools.

commit af920cd0795af066850825958904bfa510c00c15
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Mon May 25 15:22:01 2015 +0000

    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 at xorcom.com>
---
 Makefile.am         | 2 +-
 configure.ac        | 2 ++
 hotplug/Makefile.am | 2 +-
 xpp/Makefile.am     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c238b08..ae02039 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ libtonezone_la_SOURCES	= \
 	zonedata.c \
 	tonezone.c \
 	version.c
-pkginclude_HEADERS	= tonezone.h
+dahdiinclude_HEADERS	= tonezone.h
 libtonezone_la_CFLAGS	= $(CFLAGS) -I$(srcdir) -DBUILDING_TONEZONE
 libtonezone_la_LDFLAGS	= -version-info "$(LTZ_CURRENT):$(LTZ_REVISION):$(LTZ_AGE)"
 
diff --git a/configure.ac b/configure.ac
index 59e691d..c688f66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,8 @@ fi
 if test ${localstatedir} = '${prefix}/var'; then
      localstatedir=/var
 fi
+AC_SUBST([dahditoolsdir], ['${datadir}/dahdi'])
+AC_SUBST([dahdiincludedir], ['${includedir}/dahdi'])
 
 AC_SUBST([udevrulesdir], '${sysconfdir}/udev/rules.d')
 
diff --git a/hotplug/Makefile.am b/hotplug/Makefile.am
index ae2b496..fa252db 100644
--- a/hotplug/Makefile.am
+++ b/hotplug/Makefile.am
@@ -1,5 +1,5 @@
 
-nobase_dist_pkgdata_SCRIPTS	= \
+nobase_dist_dahditools_SCRIPTS	= \
 	dahdi_handle_device	\
 	dahdi_span_config	\
 	dahdi_auto_assign_compat	\
diff --git a/xpp/Makefile.am b/xpp/Makefile.am
index 7a9eb58..da73121 100644
--- a/xpp/Makefile.am
+++ b/xpp/Makefile.am
@@ -52,7 +52,7 @@ perl_mans	= $(perl_scripts:%=%.8)
 
 endif
 
-dist_pkgdata_SCRIPTS	= xpp_fxloader astribank_hook waitfor_xpds
+dist_dahditools_SCRIPTS	= xpp_fxloader astribank_hook waitfor_xpds
 udevrulesdir	= @udevrulesdir@
 udevrules_DATA	= xpp.rules
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git