- updated for 2.6.1

[packages/libfuse.git] / kernel-misc-fuse-Makefile.am.patch

diff --git a/kernel-misc-fuse-Makefile.am.patch b/kernel-misc-fuse-Makefile.am.patch
index c76e66e54f0c19ab72069e35f30836a24cb2c642..50d5ddad51734f723f8ee10c313da83675979640 100644 (file)
--- a/kernel-misc-fuse-Makefile.am.patch
+++ b/kernel-misc-fuse-Makefile.am.patch
@@ -1,5 +1,5 @@
---- fuse-2.6.0/util/Makefile.am.orig   2006-10-07 18:43:50.000000000 +0200
-+++ fuse-2.6.0/util/Makefile.am        2006-10-29 15:24:08.785365500 +0100
+--- fuse-2.6.1/util/Makefile.am.orig   2006-10-28 09:37:12.000000000 +0200
++++ fuse-2.6.1/util/Makefile.am        2006-12-09 19:18:05.731925390 +0100
 @@ -9,15 +9,6 @@
  ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT 
  ulockmgr_server_LDFLAGS = -pthread
@@ -9,20 +9,20 @@
 -      -chmod u+s $(DESTDIR)$(bindir)/fusermount
 -      @if test ! -e $(DESTDIR)/dev/fuse; then \
 -              $(mkdir_p) $(DESTDIR)/dev; \
--              echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
--              mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
+-              echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
+-              mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
 -      fi
 -
  EXTRA_DIST = mount.fuse udev.rules init_script
  
  MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
-@@ -20,10 +20,6 @@
+@@ -29,10 +20,6 @@
        $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
        $(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
        $(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
 -      @if test -x /usr/sbin/update-rc.d; then \
--              echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 ."; \
--              /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .; \
+-              echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+-              /usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
 -      fi
  
  install-data-local: