sr: New default firmware dir: $prefix/share/sigrok-firmware.

We no longer expect firmware files to be in the
$prefix/share/libsigrok/firmware directory, as that would require an
additional (distro) package 'sigrok-firmware' or the like to install
files into another package's (libsigrok) path, which can be problematic.

The current 'sigrok-firmware' repo's "make install" will already install
all files into $prefix/share/sigrok-firmware.

diff --git a/Makefile.am b/Makefile.am
index f455c8008b7c0badae6cc4153b5d92703b73d7b0..3bd9f8944bb729c5110b5e5dddeb5a5f179f4457 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I autostuff
 
 AM_CPPFLAGS = -I$(top_srcdir)
 
-SUBDIRS = contrib hardware input output firmware
+SUBDIRS = contrib hardware input output
 
 lib_LTLIBRARIES = libsigrok.la
 

diff --git a/configure.ac b/configure.ac
index d123c02831c4ca7cc107b7f80c0d7a92df7ecb67..911987ef588619897a629aceae37ace2acfc869e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull])
 
-AC_SUBST(FIRMWARE_DIR, "$datadir/libsigrok/firmware")
+AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
@@ -255,7 +255,6 @@ AC_SUBST(SR_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile
                 sigrok.h
-                firmware/Makefile
                 hardware/Makefile
                 hardware/alsa/Makefile
                 hardware/asix-sigma/Makefile

diff --git a/firmware/Makefile.am b/firmware/Makefile.am
deleted file mode 100644 (file)
index 04bb9ed..0000000
--- a/firmware/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## This file is part of the sigrok project.
-##
-## Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-##
-
-pkgdatadir = $(FIRMWARE_DIR)
-
-dist_pkgdata_DATA = README
-

diff --git a/firmware/README b/firmware/README
deleted file mode 100644 (file)
index 2b40d04..0000000
--- a/firmware/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Place any firmware files required by your logic analyzer hardware into
-this directory.
-