Build system cleanup

1) Undefine non-unique entries in spl_config.h
2) Minor Makefile cleanup
3) Don't use includedir for proper kernel header install

diff --git a/Makefile.am b/Makefile.am
index 410d9a689c01388727bb1ff537a28556c88c6f2a..37182fe7f510d819230627a81fa60a5c75925db5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = lib cmd module include scripts
 
 AUTOMAKE_OPTIONS = foreign dist-zip
-EXTRA_DIST = autogen.sh spl.spec META DISCLAIMER
-include_HEADERS = spl_config.h
+EXTRA_DIST = autogen.sh spl.spec.in META DISCLAIMER
+noinst_HEADERS = spl_config.h
 
 distclean-local::
        -$(RM) -R autom4te*.cache
@@ -16,7 +16,7 @@ distclean-local::
                -type f -print | xargs $(RM)
 
 install-data-local:
-       $(INSTALL) module/Module.symvers $(DESTDIR)/$(includedir)
+       $(INSTALL) -D spl_config.h $(DESTDIR)/$(LINUX)/include/spl/spl_config.h
 
 ctags:
        $(RM) $(top_srcdir)/tags

diff --git a/Makefile.in b/Makefile.in
index 1bdb7b7a976da0983873443b575b2c181ce34e14..6b212bb65981b60a733c418169889cc5c7399d33 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,7 +37,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \
+DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/spl.spec.in $(srcdir)/spl_config.h.in \
        $(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \
@@ -66,15 +66,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        install-recursive installcheck-recursive installdirs-recursive \
        pdf-recursive ps-recursive uninstall-info-recursive \
        uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -210,8 +202,8 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = lib cmd module include scripts
 AUTOMAKE_OPTIONS = foreign dist-zip
-EXTRA_DIST = autogen.sh spl.spec META DISCLAIMER
-include_HEADERS = spl_config.h
+EXTRA_DIST = autogen.sh spl.spec.in META DISCLAIMER
+noinst_HEADERS = spl_config.h
 all: spl_config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -284,23 +276,6 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool
 uninstall-info-am:
-install-includeHEADERS: $(include_HEADERS)
-       @$(NORMAL_INSTALL)
-       test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-       @list='$(include_HEADERS)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f=$(am__strip_dir) \
-         echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-         $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-       done
-
-uninstall-includeHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(include_HEADERS)'; for p in $$list; do \
-         f=$(am__strip_dir) \
-         echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-         rm -f "$(DESTDIR)$(includedir)/$$f"; \
-       done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -580,9 +555,6 @@ check: check-recursive
 all-am: Makefile $(HEADERS) spl_config.h
 installdirs: installdirs-recursive
 installdirs-am:
-       for dir in "$(DESTDIR)$(includedir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -627,7 +599,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-includeHEADERS
+install-data-am: install-data-local
 
 install-exec-am:
 
@@ -655,7 +627,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
@@ -668,14 +640,12 @@ uninstall-info: uninstall-info-recursive
        distcleancheck distdir distuninstallcheck dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-data-local install-exec \
-       install-exec-am install-includeHEADERS install-info \
-       install-info-am install-man install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic maintainer-clean-recursive \
-       mostlyclean mostlyclean-generic mostlyclean-libtool \
-       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-       uninstall uninstall-am uninstall-includeHEADERS \
-       uninstall-info-am
+       install-exec-am install-info install-info-am install-man \
+       install-strip installcheck installcheck-am installdirs \
+       installdirs-am maintainer-clean maintainer-clean-generic \
+       maintainer-clean-recursive mostlyclean mostlyclean-generic \
+       mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+       tags tags-recursive uninstall uninstall-am uninstall-info-am
 
 
 distclean-local::
@@ -690,7 +660,7 @@ distclean-local::
                -type f -print | xargs $(RM)
 
 install-data-local:
-       $(INSTALL) module/Module.symvers $(DESTDIR)/$(includedir)
+       $(INSTALL) -D spl_config.h $(DESTDIR)/$(LINUX)/include/spl/spl_config.h
 
 ctags:
        $(RM) $(top_srcdir)/tags

diff --git a/config/spl-meta.m4 b/config/spl-meta.m4
index 0fd1f65d09a20155b1ddf5a09ef28608a7495957..54c9ac38fc5f99a7cf3c16c6c0143f858db00a4d 100644 (file)
--- a/config/spl-meta.m4
+++ b/config/spl-meta.m4
@@ -4,8 +4,20 @@ dnl # Read metadata from the META file.
 dnl #
 dnl # AUTHOR:
 dnl # Chris Dunlap <cdunlap@llnl.gov>
+dnl # Brian Behlendorf <behlendorf1@llnl.gov>
 dnl #
 AC_DEFUN([SPL_AC_META], [
+
+       AH_BOTTOM([
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef STDC_HEADERS
+#undef VERSION])
+
        AC_MSG_CHECKING([metadata])
 
        META="$srcdir/META"

diff --git a/configure b/configure
index 0c4a90cc626ef9f13cfb664dff1026a175fb1575..92dd8d732de2ea8de39223d6fca907d3c7e495d7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1503,6 +1503,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
 
        echo "$as_me:$LINENO: checking metadata" >&5
 echo $ECHO_N "checking metadata... $ECHO_C" >&6
@@ -3978,7 +3988,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3981 "configure"' > conftest.$ac_ext
+  echo '#line 3991 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5577,7 +5587,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5580:" \
+echo "$as_me:5590:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6640,11 +6650,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6643: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6653: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6647: \$? = $ac_status" >&5
+   echo "$as_me:6657: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6908,11 +6918,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6911: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6921: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6915: \$? = $ac_status" >&5
+   echo "$as_me:6925: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7012,11 +7022,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7015: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7025: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7019: \$? = $ac_status" >&5
+   echo "$as_me:7029: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8481,7 +8491,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 8484 "configure"' > conftest.$ac_ext
+    echo '#line 8494 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9378,7 +9388,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9381 "configure"
+#line 9391 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9478,7 +9488,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9481 "configure"
+#line 9491 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11821,11 +11831,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11824: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11834: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11828: \$? = $ac_status" >&5
+   echo "$as_me:11838: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11925,11 +11935,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11928: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11938: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11932: \$? = $ac_status" >&5
+   echo "$as_me:11942: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12461,7 +12471,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 12464 "configure"' > conftest.$ac_ext
+    echo '#line 12474 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13519,11 +13529,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13522: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13532: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13526: \$? = $ac_status" >&5
+   echo "$as_me:13536: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13623,11 +13633,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13626: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13636: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13630: \$? = $ac_status" >&5
+   echo "$as_me:13640: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15072,7 +15082,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 15075 "configure"' > conftest.$ac_ext
+    echo '#line 15085 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -15850,11 +15860,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15853: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15863: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15857: \$? = $ac_status" >&5
+   echo "$as_me:15867: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16118,11 +16128,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16131: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16125: \$? = $ac_status" >&5
+   echo "$as_me:16135: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16222,11 +16232,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16225: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16235: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16229: \$? = $ac_status" >&5
+   echo "$as_me:16239: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17691,7 +17701,7 @@ linux*)
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 17694 "configure"' > conftest.$ac_ext
+    echo '#line 17704 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -18916,9 +18926,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
-
-LINUX=
-LINUX_OBJ=
 
 
 

diff --git a/configure.ac b/configure.ac
index 6285afa22938f3c03d5647459c14ab4757392cbd..7409cba6e61d6911ca966910ab264f0d6a5001a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@
  */
 
 AC_INIT
+AC_LANG(C)
 SPL_AC_META
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
@@ -36,9 +37,6 @@ AC_PROG_INSTALL
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
-LINUX=
-LINUX_OBJ=
-
 SPL_AC_KERNEL
 SPL_AC_LICENSE
 SPL_AC_DEBUG

diff --git a/include/Makefile.am b/include/Makefile.am
index 0b58dd9f842e2b9c87014daa492195980b917fff..f85380f79b93dac099866bbd7e2dd41c97ed35df 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,15 +1,23 @@
-# All headers are referenced by this top level Makefile.am and the
-# nobase_* rule is used to ensure all path information is preserved
-# when using the 'make install' target.
-nobase_include_HEADERS  = *.h
-nobase_include_HEADERS += asm/*.h
-nobase_include_HEADERS += fs/*.h
-nobase_include_HEADERS += linux/*.h
-nobase_include_HEADERS += rpc/*.h
-nobase_include_HEADERS += sharefs/*.h
-nobase_include_HEADERS += sys/fm/*.h
-nobase_include_HEADERS += sys/fs/*.h
-nobase_include_HEADERS += sys/sysevent/*.h
-nobase_include_HEADERS += sys/*.h
-nobase_include_HEADERS += util/*.h
-nobase_include_HEADERS += vm/*.h
+# All headers are referenced by this top level Makefile.am are
+# noinst_HEADERS because they are not installed in the usual include
+# location.  We do not want to be using $includedir for this.
+# Installation is handled by the custom install-data-local rule.
+noinst_HEADERS  = *.h
+noinst_HEADERS += asm/*.h
+noinst_HEADERS += fs/*.h
+noinst_HEADERS += linux/*.h
+noinst_HEADERS += rpc/*.h
+noinst_HEADERS += sharefs/*.h
+noinst_HEADERS += sys/fm/*.h
+noinst_HEADERS += sys/fs/*.h
+noinst_HEADERS += sys/sysevent/*.h
+noinst_HEADERS += sys/*.h
+noinst_HEADERS += util/*.h
+noinst_HEADERS += vm/*.h
+
+install-data-local:
+       instdest=$(DESTDIR)/$(LINUX)/include/spl; \
+       instfiles=`find . -name '*.h'`; \
+        for instfile in $$instfiles; do \
+               $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+        done

diff --git a/include/Makefile.in b/include/Makefile.in
index 4dfe80800594e06d50de1443909541e1e7b3957c..e70ab9ff7f1a3b60ab2729d922bd8c9e326ff142 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -38,7 +38,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = include
-DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/spl-build.m4 \
@@ -50,15 +50,7 @@ CONFIG_HEADER = $(top_builddir)/spl_config.h
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
-nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
-HEADERS = $(nobase_include_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -182,12 +174,12 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 
-# All headers are referenced by this top level Makefile.am and the
-# nobase_* rule is used to ensure all path information is preserved
-# when using the 'make install' target.
-nobase_include_HEADERS = *.h asm/*.h fs/*.h linux/*.h rpc/*.h \
-       sharefs/*.h sys/fm/*.h sys/fs/*.h sys/sysevent/*.h sys/*.h \
-       util/*.h vm/*.h
+# All headers are referenced by this top level Makefile.am are
+# noinst_HEADERS because they are not installed in the usual include
+# location.  We do not want to be using $includedir for this.
+# Installation is handled by the custom install-data-local rule.
+noinst_HEADERS = *.h asm/*.h fs/*.h linux/*.h rpc/*.h sharefs/*.h \
+       sys/fm/*.h sys/fs/*.h sys/sysevent/*.h sys/*.h util/*.h vm/*.h
 all: all-am
 
 .SUFFIXES:
@@ -230,25 +222,6 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool
 uninstall-info-am:
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
-       @$(NORMAL_INSTALL)
-       test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-       @$(am__vpath_adj_setup) \
-       list='$(nobase_include_HEADERS)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         $(am__vpath_adj) \
-         echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-         $(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-       done
-
-uninstall-nobase_includeHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @$(am__vpath_adj_setup) \
-       list='$(nobase_include_HEADERS)'; for p in $$list; do \
-         $(am__vpath_adj) \
-         echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-         rm -f "$(DESTDIR)$(includedir)/$$f"; \
-       done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -330,9 +303,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
-       for dir in "$(DESTDIR)$(includedir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -376,7 +346,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-nobase_includeHEADERS
+install-data-am: install-data-local
 
 install-exec-am:
 
@@ -402,20 +372,26 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
        clean-libtool ctags distclean distclean-generic \
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
-       install-data-am install-exec install-exec-am install-info \
-       install-info-am install-man install-nobase_includeHEADERS \
+       install-data-am install-data-local install-exec \
+       install-exec-am install-info install-info-am install-man \
        install-strip installcheck installcheck-am installdirs \
        maintainer-clean maintainer-clean-generic mostlyclean \
        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags uninstall uninstall-am uninstall-info-am \
-       uninstall-nobase_includeHEADERS
+       tags uninstall uninstall-am uninstall-info-am
+
 
+install-data-local:
+       instdest=$(DESTDIR)/$(LINUX)/include/spl; \
+       instfiles=`find . -name '*.h'`; \
+        for instfile in $$instfiles; do \
+               $(INSTALL) -D $$instfile $$instdest/$$instfile; \
+        done
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/module/Makefile.in b/module/Makefile.in
index 3fd7dbd8b77b43bd549f62dd03714b74dc6e5400..abb3794823ad9aa39c57438fb96a1b41208e8b75 100644 (file)
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -1,11 +1,16 @@
 subdir-m += spl
 subdir-m += splat
 
+INSTALL=/usr/bin/install
+
 modules clean:
        $(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
 
 modules_install:
-       $(MAKE) -C @LINUX@ SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
+       $(MAKE) -C @LINUX@ SUBDIRS=`pwd` \
+               INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
+       $(INSTALL) -D Module.symvers \
+               $(DESTDIR)/@LINUX@/include/spl/Module.symvers
 
 distdir:
        list='$(subdir-m)'; for subdir in $$list; do \

diff --git a/spl.spec.in b/spl.spec.in
index 3090ba7109778742f02acb2583c282a9cd1f912e..cb264850939bec7e7e9afb6b9690de1b26af0114 100644 (file)
--- a/spl.spec.in
+++ b/spl.spec.in
@@ -69,7 +69,7 @@ symbols needed for building additional modules which use %{name}.
 %prep
 %setup
 %build
-%configure --includedir=%{kdir}/include/spl --with-linux=%{kdir}
+%configure --with-linux=%{kdir}
 make
 
 %install

diff --git a/spl_config.h.in b/spl_config.h.in
index 7e677708afb234c50565156f2811f10ed8054bc8..931539c81454c5493ea710be6a9e7f6288321c48 100644 (file)
--- a/spl_config.h.in
+++ b/spl_config.h.in
@@ -179,3 +179,13 @@
 
 /* Version number of package */
 #undef VERSION
+
+
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef STDC_HEADERS
+#undef VERSION