[dahdi-commits] dahdi/tools.git branch "master" updated.
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Mon May 25 22:05:34 CDT 2015
branch "master" has been updated
via 66e2c3ba116a6f66b437d479fd89564090ef96fa (commit)
via 94ca4a1bb4ad56766c08a0af17fdd900504763f0 (commit)
via af920cd0795af066850825958904bfa510c00c15 (commit)
from b375bb80b8db1c7d4a9eba07f97fd80199347746 (commit)
Summary of changes:
Makefile.am | 2 +-
Makefile.legacy | 14 ---------
configure.ac | 66 ++++++++++++++++++++++++++++++++++--------
hotplug/Makefile.am | 2 +-
xpp/Makefile.am | 2 +-
xpp/perl_modules/Makefile.am | 1 +
6 files changed, 58 insertions(+), 29 deletions(-)
- Log -----------------------------------------------------------------
commit 66e2c3ba116a6f66b437d479fd89564090ef96fa
Author: Oron Peled <oron.peled at xorcom.com>
Date: Sun Dec 21 10:29:35 2014 -0500
autotools: now "make distcheck" also works.
* Fix distcheck by having all the targets installed under $prefix
* But by default (no prefix or prefix=/usr), revert to older pathes:
- /etc/dahdi
- udev rules in /etc/udev/rules.d
- perl in perl sitelib
- man pages in /usr/share/man
* Add configure options:
--with-udevrules= (e.g.: /lib/udev/rules.d)
--with-perllib= (e.g.: `perl -V:vendorlib)
Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
diff --git a/configure.ac b/configure.ac
index c688f66..5a38257 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,21 +25,42 @@ AM_CONDITIONAL([SILENT_RULES], [test "$AM_DEFAULT_VERBOSITY" = '0'])
AC_COPYRIGHT("dahdi-tools")
AC_REVISION($Revision$)
+# Preserve old defaults if called without --prefix or --prefix=/usr
+# prefix=/usr
+# sysconfdir=/etc
+
ac_default_prefix=/usr
-if test ${sysconfdir} = '${prefix}/etc'; then
- sysconfdir=/etc
-fi
-if test ${mandir} = '${prefix}/man'; then
- mandir=/usr/share/man
-fi
+if test "$prefix" = 'NONE' -o "$prefix" = '/usr'; then
+ if test ${sysconfdir} = '${prefix}/etc'; then
+ sysconfdir=/etc
+ fi
+ if test ${mandir} = '${prefix}/man'; then
+ mandir=/usr/share/man
+ fi
-if test ${localstatedir} = '${prefix}/var'; then
- localstatedir=/var
+ if test ${localstatedir} = '${prefix}/var'; then
+ localstatedir=/var
+ fi
fi
AC_SUBST([dahditoolsdir], ['${datadir}/dahdi'])
AC_SUBST([dahdiincludedir], ['${includedir}/dahdi'])
-AC_SUBST([udevrulesdir], '${sysconfdir}/udev/rules.d')
+# Where to install udev rules?
+# * Our default is $sysconfdir/udev/rules.d:
+# - This preserve legacy location.
+# - It doesn't write into modern vendor supplied location (/lib/udev/rules.d)
+# - It doesn't break "make distcheck" (where everything should be relative
+# to prefix.
+# * Packagers are encouraged to use --udevrules=/lib/udev/rules.d
+#
+m4_define([_UDEV_RULES_DIR_DEFAULT], [${sysconfdir}/udev/rules.d])dnl
+AC_ARG_WITH(udevrules,
+ [AS_HELP_STRING([--with-udevrules=PATH],
+ [Location of UDEV rules @<:@default=]_UDEV_RULES_DIR_DEFAULT[@:>@])],
+ [udevrulesdir=$withval],
+ [udevrulesdir=]'_UDEV_RULES_DIR_DEFAULT'
+)
+AC_SUBST([udevrulesdir], "$udevrulesdir")
# specify output header file
AC_CONFIG_HEADER(autoconfig.h)
@@ -94,9 +115,28 @@ AC_PATH_PROG([PERL], [perl])
if test "$PERL" = ''; then
AC_MSG_ERROR(perl is mandatory)
fi
+# Where to install perl modules?
+# * Packagers are encouraged to use the result of "perl -V:vendorlib"
+# * Our default is:
+# - The result of "perl -V:sitelib" for our default prefix (/usr)
+# - The "$datadir/perl5" directory otherwise (e.g: during "make distcheck")
+#
AC_MSG_CHECKING(for perl libdir)
-eval `"$PERL" -V:sitelib`
-AC_SUBST([perllibdir], [`echo "$sitelib"`])
+m4_define([_PERL_LIBDIR_DEFAULT], [${datadir}/perl5])dnl
+AC_ARG_WITH(perllib,
+ [AS_HELP_STRING([--with-perllib=PATH],
+ [Location of perl modules @<:@default=]_PERL_LIBDIR_DEFAULT[, or perl -V:sitelib@:>@])],
+ [perllibdir=$withval],
+ [
+ if test "$prefix" = 'NONE' -o "$prefix" = '/usr'; then
+ eval `"$PERL" -V:sitelib`
+ perllibdir="$sitelib"
+ else
+ perllibdir='_PERL_LIBDIR_DEFAULT'
+ fi
+ ]
+)
+AC_SUBST([perllibdir], "$perllibdir")
AC_MSG_RESULT([$perllibdir])
AM_CONDITIONAL([PERL], [test "$perllibdir" != ''])
diff --git a/xpp/perl_modules/Makefile.am b/xpp/perl_modules/Makefile.am
index 3239e1b..bce7962 100644
--- a/xpp/perl_modules/Makefile.am
+++ b/xpp/perl_modules/Makefile.am
@@ -1,3 +1,4 @@
+perllibdir = @perllibdir@
nobase_perllib_DATA = \
Dahdi.pm \
Dahdi/Hardware.pm \
commit 94ca4a1bb4ad56766c08a0af17fdd900504763f0
Author: Oron Peled <oron.peled at xorcom.com>
Date: Mon May 18 19:06:21 2015 +0000
automake: remove unused stuff from Makefile.legacy
Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
diff --git a/Makefile.legacy b/Makefile.legacy
index 8bd58ae..0366fad 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -14,20 +14,6 @@ ifeq ($(strip $(foreach var,clean,$(findstring $(var),$(MAKECMDGOALS)))),)
endif
endif
-ifneq (,$(findstring ppc,$(UNAME_M)))
-CFLAGS+=-fsigned-char
-endif
-ifneq (,$(findstring x86_64,$(UNAME_M)))
-CFLAGS+=-m64
-endif
-
-ROOT_PREFIX=
-
-# extra cflags to build dependencies. Recursively expanded.
-MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP
-
-CFLAGS+=$(DAHDI_INCLUDE)
-
CHKCONFIG := $(wildcard /sbin/chkconfig)
UPDATE_RCD := $(wildcard /usr/sbin/update-rc.d)
ifeq (,$(DESTDIR))
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>
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
-----------------------------------------------------------------------
--
dahdi/tools.git
More information about the dahdi-commits
mailing list