[PATCH] Patches from Harald Hoyer <harald@redhat.com>.

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index c419e8860fc7dd97722f18594ffcc23ef4a48878..8605811cf57381dade48d0a78c8150c622cc4443 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -33,13 +33,13 @@ override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts \
 
 override CFLAGS+=-D_FILE_OFFSET_BITS=64
 
-SYSFS =        ../../libsysfs/sysfs_bus.o      \
-       ../../libsysfs/sysfs_class.o    \
-       ../../libsysfs/sysfs_device.o   \
-       ../../libsysfs/sysfs_dir.o      \
-       ../../libsysfs/sysfs_driver.o   \
-       ../../libsysfs/sysfs_utils.o    \
-       ../../libsysfs/dlist.o
+override SYSFS =       ../../libsysfs/sysfs_bus.o      \
+                       ../../libsysfs/sysfs_class.o    \
+                       ../../libsysfs/sysfs_device.o   \
+                       ../../libsysfs/sysfs_dir.o      \
+                       ../../libsysfs/sysfs_driver.o   \
+                       ../../libsysfs/sysfs_utils.o    \
+                       ../../libsysfs/dlist.o
 
 
 
@@ -60,8 +60,8 @@ clean:
 spotless: clean
 
 install: all
-       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
 uninstall:
-       - rm $(DESTDIR)$(usrsbindir)/$(PROG)
+       - rm $(DESTDIR)$(sbindir)/$(PROG)