hal/tools/device-manager Makefile.am, 1.4, 1.5 hal-device-manager, 1.4, NONE

[David Zeuthen]

Update of /cvs/hal/hal/tools/device-manager
In directory gabe:/tmp/cvs-serv19763/tools/device-manager

Modified Files:
	Makefile.am 
Removed Files:
	hal-device-manager 
Log Message:
2004-11-01  David Zeuthen  <davidz at redhat.com>

	* tools/device-manager/hal-device-manager.in: New file; append
	path to where we install so we don't need a symlink to /usr/share.
	Fixes issue with SELinux strict policy (RH Bug #134845)

	* tools/device-manager/hal-device-manager: Delete this one as it is
	now generated by configure

2004-10-29  David Zeuthen  <davidz at redhat.com>

	* fdi/90defaultpolicy/storage-policy.fdi: Allow SCSI optical drives
	and correct typo in 'sync' (was 'async').
	
2004-10-29  David Zeuthen  <davidz at redhat.com>

	* hald/linux/pcmcia_utils.c (pcmcia_socket_open): Refine socket
	location order to work better with SELinux. From Dan Walsh
	<dwalsh at redhat.com>



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	20 Sep 2004 18:31:15 -0000	1.4
+++ Makefile.am	1 Nov 2004 22:57:21 -0000	1.5
@@ -1,4 +1,8 @@
 
+devicemanagerbindir = $(bindir)
+
+dist_devicemanagerbin_SCRIPTS = hal-device-manager
+
 devicemanagerdir = $(datadir)/hal/device-manager
 
 dist_devicemanager_SCRIPTS = hal-device-manager
@@ -26,9 +30,9 @@
                        hal-device-manager.glade
 
 # symlink into $(bindir) for convenience
-install-data-local :
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	- cd $(DESTDIR)$(bindir) && $(LN_S) $(pkgdatadir)/device-manager/hal-device-manager hal-device-manager
-
-uninstall-local :
-	- rm -f $(DESTDIR)$(bindir)/hal-device-manager
+#install-data-local :
+#	$(mkinstalldirs) $(DESTDIR)$(bindir)
+#	- cd $(DESTDIR)$(bindir) && $(CP) $(pkgdatadir)/device-manager/hal-device-manager hal-device-manager
+#
+#uninstall-local :
+#	- rm -f $(DESTDIR)$(bindir)/hal-device-manager

--- hal-device-manager DELETED ---