hal: Branch 'master'

[David Zeuthen]

 configure.in                     |    2 --
 tools/device-manager/Makefile.am |   13 +++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
diff-tree f1f5d0e4389c0d2c8b86eb21d0d4681ad3cb739a (from 13e11b6bf1126ec0a439459da5a4b1f2c8b02e97)
Author: Andreas Hanke <andreas.hanke at gmx-topmail.de>
Date:   Sun Mar 4 19:39:33 2007 -0500

    fixes for AS_AC_EXPAND usage breaks hal-device-manager
    
    https://bugs.freedesktop.org/show_bug.cgi?id=10108

diff --git a/configure.in b/configure.in
index e6b00bb..ce51b01 100644
--- a/configure.in
+++ b/configure.in
@@ -803,9 +803,7 @@ libhal-storage/Makefile
 tools/Makefile
 tools/freebsd/Makefile
 tools/linux/Makefile
-tools/device-manager/hal-device-manager
 tools/device-manager/Makefile
-tools/device-manager/Const.py
 partutil/Makefile
 privileges/Makefile
 fdi/Makefile
diff --git a/tools/device-manager/Makefile.am b/tools/device-manager/Makefile.am
index f382f66..5506b71 100644
--- a/tools/device-manager/Makefile.am
+++ b/tools/device-manager/Makefile.am
@@ -27,6 +27,19 @@ dist_devicemanager_DATA =               
                        hal-computer.png      hal-serial-port.png   \
                        hal-device-manager.glade
 
+Const.py: Const.py.in Makefile
+	sed -e 's|[@]DATADIR[@]|$(datadir)|g' \
+	    -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \
+	    -e 's|[@]VERSION[@]|$(VERSION)|g' \
+	    < $(srcdir)/$@.in > $@
+
+hal-device-manager: hal-device-manager.in Makefile
+	sed -e 's|[@]DATADIR[@]|$(datadir)|g' \
+	    -e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \
+	    < $(srcdir)/$@.in > $@
+
+CLEANFILES = Const.py hal-device-manager
+
 # symlink into $(bindir) for convenience
 #install-data-local :
 #	$(mkinstalldirs) $(DESTDIR)$(bindir)