--- tools/Makefile.in.orig	2016-12-05 16:21:23 UTC
+++ tools/Makefile.in
@@ -37,6 +37,7 @@ build_triplet = @build@
 host_triplet = @host@
 @HALD_COMPILE_LINUX_TRUE@am__append_1 = linux
 @HALD_COMPILE_FREEBSD_TRUE@am__append_2 = freebsd
+@HALD_COMPILE_BSDSUNIX_TRUE@am__append_10 = bsdsunix
 bin_PROGRAMS = lshal$(EXEEXT) hal-get-property$(EXEEXT) \
 	hal-set-property$(EXEEXT) hal-find-by-capability$(EXEEXT) \
 	hal-find-by-property$(EXEEXT) hal-device$(EXEEXT) \
@@ -491,15 +492,15 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 udev_prefix = @udev_prefix@
-SUBDIRS = $(am__append_1) $(am__append_2)
-DIST_SUBDIRS = freebsd linux
+SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_10)
+DIST_SUBDIRS = bsdsunix freebsd linux
 AM_CPPFLAGS = \
 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_BIN_DIR=\""$(bindir)"\" \
 	-DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \
-	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \
+	-DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/hal/scripts"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
 	-I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \
 	@DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@
@@ -551,7 +552,7 @@ hal_system_setserial_LDADD = 
 @HAVE_PMU_TRUE@hal_system_power_pmu_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
 @HAVE_SONYPIC_TRUE@hal_system_sonypic_SOURCES = hal-system-sonypic.c
 @HAVE_SONYPIC_TRUE@hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
-scriptdir = $(libexecdir)/scripts
+scriptdir = $(libexecdir)/hal/scripts
 script_SCRIPTS = \
 	hal-luks-setup                          \
 	hal-luks-teardown                       \