BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Uwe Hermann 2012-05-30 00:00:33 +02:00
parent c09584085e
commit fb6f1978ed
4 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I autostuff
AM_CPPFLAGS = -I$(top_srcdir) AM_CPPFLAGS = -I$(top_srcdir)
SUBDIRS = contrib hardware input output firmware SUBDIRS = contrib hardware input output
lib_LTLIBRARIES = libsigrok.la lib_LTLIBRARIES = libsigrok.la

3
configure.ac
View File

@ -239,7 +239,7 @@ AC_TYPE_SIZE_T
# Checks for library functions. # Checks for library functions.
AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull]) 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(MAKEFLAGS, '--no-print-directory')
AC_SUBST(AM_LIBTOOLFLAGS, '--silent') AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
@ -255,7 +255,6 @@ AC_SUBST(SR_PACKAGE_VERSION)
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
sigrok.h sigrok.h
firmware/Makefile
hardware/Makefile hardware/Makefile
hardware/alsa/Makefile hardware/alsa/Makefile
hardware/asix-sigma/Makefile hardware/asix-sigma/Makefile

24
firmware/Makefile.am
View File

@ -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

3
firmware/README
View File

@ -1,3 +0,0 @@
Place any firmware files required by your logic analyzer hardware into
this directory.