- change to use the new directory layout

- bump version to 0.99.2

3 files changed, 28 insertions, 8 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index dd85518..fdfcfa2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,12 @@
-sbin_PROGRAMS =			\
+pm_utils_bindir = $(libdir)/pm-utils/bin
+
+pm_utils_bin_PROGRAMS =		\
 	pm-pmu			\
 	pm-reset-swap
 
+pm_utils_bin_SCRIPTS =		\
+	pm-action
+
 pm_pmu_SOURCES = 		\
 	pm-pmu.c
 
@@ -11,8 +16,7 @@ pm_reset_swap_SOURCES = 	\
 extradir = $(sbindir)
 
 extra_SCRIPTS =			\
-	pm-powersave		\
-	pm-action
+	pm-powersave
 
 acpowerdir = $(bindir)
 
@@ -20,8 +24,9 @@ acpower_SCRIPTS =		\
 	on_ac_power
 
 install-exec-hook:
-	-ln -s pm-action $(DESTDIR)$(sbindir)/pm-suspend
-	-ln -s pm-action $(DESTDIR)$(sbindir)/pm-hibernate
+	-mkdir -p $(DESTDIR)$(sbindir)
+	-ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-suspend
+	-ln -s $(pm_utils_bindir)/pm-action $(DESTDIR)$(sbindir)/pm-hibernate
 
 EXTRA_DIST =			\
 	$(extra_SCRIPTS)	\
diff --git a/src/pm-action b/src/pm-action
index d4a2e36..fea12c8 100755
--- a/src/pm-action
+++ b/src/pm-action
@@ -83,7 +83,7 @@ do
 	shift
 done
 
-. /etc/pm/functions
+. /usr/lib/pm-utils/functions
 
 [ -f /sys/power/state ] || exit 1
 
diff --git a/src/pm-powersave b/src/pm-powersave
index 6b960ba..e2b2732 100755
--- a/src/pm-powersave
+++ b/src/pm-powersave
@@ -24,11 +24,26 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+find_powerd_files()
+{
+	flist="/etc/pm/power.d/*[^~] /usr/lib/pm-utils/power.d/*[^~]"
+	bases=$(for file in $flist ; do echo $(basename $file) ; done | sort -n)
+	for base in $bases ; do
+		if [ -e "/etc/pm/power.d/$base" ]; then
+			if [ -x "/etc/pm/power.d/$base" ]; then
+				echo /etc/pm/power.d/$base
+			fi
+		elif [ -x "/usr/lib/pm-utils/power.d/$base" ]; then
+			echo /usr/lib/pm-utils/power.d/$base
+		fi
+	done
+}
+
 runpowerhooks()
 {
-	files="/etc/pm/power.d/*[^~]"
+	files=$(find_powerd_files)
 	for file in $files ; do
-		[ -x $file ] && $file $1
+		$file $1
 	done
 }