diff options
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | hcid/Makefile.am | 2 | ||||
| -rw-r--r-- | rfcomm/Makefile.am | 2 | ||||
| -rw-r--r-- | sdpd/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | utils.spec | 20 |
6 files changed, 18 insertions, 18 deletions
diff --git a/configure.in b/configure.in index 56b4132f..0c086693 100644 --- a/configure.in +++ b/configure.in @@ -9,13 +9,10 @@ AM_MAINTAINER_MODE AM_INIT_AUTOMAKE(bluez-utils, 2.5) -AC_SUBST(DISTRO) -AC_SUBST(PCMCIA) +AC_PREFIX_DEFAULT(/usr) CFLAGS="-Wall -g -O2" -AC_PREFIX_DEFAULT() - AC_PROG_CC AC_PROG_INSTALL AC_PROG_YACC @@ -49,6 +46,9 @@ AC_SEARCH_LIB(bluetooth, hci_open_dev, $BLUEZ_LIBDIR,, Please compile and install bluez-libs package.) ) +AC_SUBST(DISTRO) +AC_SUBST(PCMCIA) + DISTRO=unknown if test "$cross_compiling" != yes; then diff --git a/hcid/Makefile.am b/hcid/Makefile.am index ba00df7e..d08f5fcd 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -mandir = $(prefix)/usr/share/man +mandir = $(prefix)/share/man sbin_PROGRAMS = hcid diff --git a/rfcomm/Makefile.am b/rfcomm/Makefile.am index aa0c5462..262dbc4c 100644 --- a/rfcomm/Makefile.am +++ b/rfcomm/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -mandir = $(prefix)/usr/share/man +mandir = $(prefix)/share/man confdir = $(sysconfdir)/bluetooth bin_PROGRAMS = rfcomm diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am index 8f50c596..c1dcb253 100644 --- a/sdpd/Makefile.am +++ b/sdpd/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -mandir = $(prefix)/usr/share/man +mandir = $(prefix)/share/man sbin_PROGRAMS = sdpd diff --git a/tools/Makefile.am b/tools/Makefile.am index 44b30990..1ff3c9bc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -mandir = $(prefix)/usr/share/man +mandir = $(prefix)/share/man sbin_PROGRAMS = hciattach hciconfig @@ -61,16 +61,16 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) /etc/rc.d/init.d/bluetooth -/bin/hcitool -/bin/l2ping -/bin/bluepin -/bin/rfcomm -/sbin/hciattach -/sbin/hciconfig -/sbin/hcid -/sbin/sdpd -/bin/sdptool -/bin/ciptool +/usr/bin/hcitool +/usr/bin/l2ping +/usr/bin/bluepin +/usr/bin/rfcomm +/usr/sbin/hciattach +/usr/sbin/hciconfig +/usr/sbin/hcid +/usr/sbin/sdpd +/usr/bin/sdptool +/usr/bin/ciptool %{_mandir}/man8/hciattach.8.gz %{_mandir}/man8/hciconfig.8.gz %{_mandir}/man5/hcid.conf.5.gz |