Fix broken 'make install'

...that was broken with dc97425bb415422423b8876af0e34111e566d56d (Haiku inclusion)

diff --git a/libusb/Makefile.am b/libusb/Makefile.am
index b3c2f05..2cd7021 100644 (file)
--- a/libusb/Makefile.am
+++ b/libusb/Makefile.am
@@ -12,7 +12,6 @@ NETBSD_USB_SRC = os/netbsd_usb.c
 WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def
 WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h
 
-dist_data_DATA = os/haiku
 DIST_SUBDIRS = 
 
 EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
@@ -21,6 +20,9 @@ EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
        os/threads_posix.c os/threads_windows.c \
        os/linux_udev.c os/linux_netlink.c
 
+dist-hook:
+       -cp -r os/haiku $(distdir)/os/haiku
+
 if OS_LINUX
 
 if USE_UDEV

diff --git a/libusb/os/haiku/Makefile.am b/libusb/os/haiku/Makefile.am
index 3ab0a09..d6639bb 100644 (file)
--- a/libusb/os/haiku/Makefile.am
+++ b/libusb/os/haiku/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = subdir-objects
 noinst_LTLIBRARIES = libhaikuusb.la
-libhaikuusb_la_CPPFLAGS = $(AM_CPPFLAGS) -I../.. -I../../..
-libhaikuusb_la_SOURCES = haiku_usb_raw.cpp haiku_usb_backend.cpp haiku_pollfs.cpp
+libhaikuusb_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../.. -I$(srcdir)/../../../..
+libhaikuusb_la_SOURCES = haiku_usb_raw.cpp haiku_usb_backend.cpp haiku_pollfs.cpp haiku_usb_raw.h haiku_usb.h

diff --git a/libusb/os/haiku/configure.ac b/libusb/os/haiku/configure.ac
index ae95179..abae783 100644 (file)
--- a/libusb/os/haiku/configure.ac
+++ b/libusb/os/haiku/configure.ac
@@ -1,8 +1,8 @@
 AC_INIT([haikuusb], [1.0])
 AM_INIT_AUTOMAKE([no-define foreign])
 AM_MAINTAINER_MODE
-AC_CONFIG_MACRO_DIR([m4])
 LT_INIT
 AC_PROG_CXX
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_MACRO_DIR([m4])
 AC_OUTPUT

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 4041786..5cc4a52 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10919
+#define LIBUSB_NANO 10920