diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-30 13:36:20 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-06-30 13:36:20 +0200 |
| commit | fa05be92c4b924ce6a791d2e7c46a467cccf357e (patch) | |
| tree | cd988312eb07f3c1e90386d76f1dd896451f0ada | |
| parent | 337ca70b39ce9477a01b97e990ad731ca13ad664 (diff) | |
use $libexecdir not $libdir/hal to define private hal directory
Multilib isn't cool, but /usr/lib64/hal/scripts/ is even less. This
switches to libexecdir to be able to set the proper install location.
--libexecdir=/usr/lib/hal should be given now at configure time.
| -rw-r--r-- | hald-runner/Makefile.am | 2 | ||||
| -rw-r--r-- | hald/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/freebsd/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/linux/Makefile.am | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/hald-runner/Makefile.am b/hald-runner/Makefile.am index 1a0b219d..a588f226 100644 --- a/hald-runner/Makefile.am +++ b/hald-runner/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\""$(bindir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \ - -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \ + -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \ -DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \ -I$(top_srcdir) \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ diff --git a/hald/Makefile.am b/hald/Makefile.am index b880685d..5b169489 100644 --- a/hald/Makefile.am +++ b/hald/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -DPACKAGE_BIN_DIR=\""$(bindir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \ - -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \ + -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \ -DHALD_SOCKET_DIR=\""$(HALD_SOCKET_DIR)"\" \ -DHALD_PID_FILE=\""$(HALD_PID_FILE)"\" \ -DPCI_IDS_DIR=\""$(PCI_IDS_DIR)"\" \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 7d1cbabe..0b99d356 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -17,7 +17,7 @@ AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_BIN_DIR=\""$(bindir)"\" \ -DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \ - -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \ + -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@ @@ -156,7 +156,7 @@ hal_system_sonypic_SOURCES = hal-system-sonypic.c hal_system_sonypic_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la endif -scriptdir = $(libdir)/hal/scripts +scriptdir = $(libexecdir)/scripts script_SCRIPTS = \ hal-luks-setup \ diff --git a/tools/freebsd/Makefile.am b/tools/freebsd/Makefile.am index 8bb4b8f9..7ec8b13a 100644 --- a/tools/freebsd/Makefile.am +++ b/tools/freebsd/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -scriptdir = $(libdir)/hal/scripts/freebsd +scriptdir = $(libexecdir)/scripts/freebsd script_SCRIPTS = \ hal-system-power-suspend-freebsd \ diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am index 484ae6aa..7f97c7d8 100644 --- a/tools/linux/Makefile.am +++ b/tools/linux/Makefile.am @@ -10,14 +10,14 @@ AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_BIN_DIR=\""$(bindir)"\" \ -DPACKAGE_LOCALSTATEDIR=\""$(localstatedir)"\" \ - -DPACKAGE_SCRIPT_DIR=\""$(libdir)/hal/scripts"\" \ + -DPACKAGE_SCRIPT_DIR=\""$(libexecdir)/scripts"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -I$(top_srcdir) -I$(top_srcdir)/libhal -I$(top_srcdir)/libhal-storage \ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @POLKIT_CFLAGS@ libexec_PROGRAMS = -scriptdir = $(libdir)/hal/scripts/linux +scriptdir = $(libexecdir)/scripts/linux script_SCRIPTS = \ hal-luks-setup-linux \ |