automake: bugfix: fix installation paths
authorOron Peled <oron.peled@xorcom.com>
Mon, 25 May 2015 15:22:01 +0000 (15:22 +0000)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Tue, 26 May 2015 09:18:30 +0000 (12:18 +0300)
* 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>

Makefile.am
configure.ac
hotplug/Makefile.am
xpp/Makefile.am

index c238b08..ae02039 100644 (file)
@@ -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)"
 
index 59e691d..c688f66 100644 (file)
@@ -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')
 
index ae2b496..fa252db 100644 (file)
@@ -1,5 +1,5 @@
 
-nobase_dist_pkgdata_SCRIPTS    = \
+nobase_dist_dahditools_SCRIPTS = \
        dahdi_handle_device     \
        dahdi_span_config       \
        dahdi_auto_assign_compat        \
index 7a9eb58..da73121 100644 (file)
@@ -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