Fixed branch update for: lufs-0.9.7

diff --git a/configure.in b/configure.in
index 71c1f83..6c5aeac 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,15 +35,14 @@ AC_ARG_WITH(cxx,
        CXX=false
     ])
 
-    dnl Checking os
-    AC_MSG_CHECKING(OS)
-    OS_DIR=`uname -s`
-    if test ! -d kernel/$OS_DIR
-    then
-       AC_MSG_ERROR($OS_DIR - not supported!)
-    else
-       AC_MSG_RESULT($OS_DIR)
-    fi
+dnl Checking os
+AC_MSG_CHECKING(OS)
+OS_DIR=`uname -s`
+if test ! -d kernel/$OS_DIR
+then
+    AC_MSG_ERROR($OS_DIR - not supported!)
+else
+    AC_MSG_RESULT($OS_DIR)
 fi
 AC_SUBST(OS_DIR)
 

diff --git a/kernel/Linux/2.6/Makefile b/kernel/Linux/2.6/Makefile
deleted file mode 100644 (file)
index 7dfc663..0000000
--- a/kernel/Linux/2.6/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-obj-m          := lufs.o
-lufs-objs      := proc.o inode.o dir.o file.o symlink.o
-
-else
-KDIR=/lib/modules/`uname -r`/build
-PWD=`pwd`
-
-.DEFAULT:
-       $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-
-endif

diff --git a/kernel/Linux/2.6/Makefile.am b/kernel/Linux/2.6/Makefile.am
new file mode 100644 (file)
index 0000000..d76bd3c
--- /dev/null
+++ b/kernel/Linux/2.6/Makefile.am
@@ -0,0 +1,23 @@
+ ifdef KERNELRELEASE
+ include $(SUBDIRS)/makefile
+ else
+
+basedir=$(datadir)/lufs
+src26dir=$(basedir)/2.6
+
+src26= \
+               lufs.h proc.h \
+               proc.c inode.c dir.c file.c symlink.c
+
+src26_DATA= \
+               lufs.h proc.h \
+               proc.c inode.c dir.c file.c symlink.c \
+               makefile
+
+install-data-hook:
+       rm -f $(DESTDIR)$(src26dir)/Makefile
+       mv -f $(DESTDIR)$(src26dir)/makefile $(DESTDIR)$(src26dir)/Makefile
+
+EXTRA_DIST=$(src26) makefile.in
+
+ endif