From 255ef81e33ec0fccedc18a38fb1bcd603a144236 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 1 Jul 2009 12:49:10 -0700
Subject: [PATCH 1/2] Fix 'make dist' on powerpc64 by include an atomic.S place
 holder file. Add EXTRA_DIST atomic.c for powerpc64 to ensure source is
 packaged.

---
 lib/libspl/asm-powerpc64/Makefile.am | 7 +++++--
 lib/libspl/asm-powerpc64/atomic.S    | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 lib/libspl/asm-powerpc64/atomic.S

diff --git a/lib/libspl/asm-powerpc64/Makefile.am b/lib/libspl/asm-powerpc64/Makefile.am
index 75d9fc6028..f302dc8369 100644
--- a/lib/libspl/asm-powerpc64/Makefile.am
+++ b/lib/libspl/asm-powerpc64/Makefile.am
@@ -2,11 +2,14 @@ include $(top_srcdir)/config/Rules.am
 
 DEFAULT_INCLUDES += \
         -I${top_srcdir}/lib/libspl/include
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
 atomic_SOURCE = atomic.c
 atomic_ASM = atomic.S
 
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	  $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+EXTRA_DIST = ${atomic_SOURCE}
+
 # Generates assembly to simplify inclusion in ../Makefile.am
 all-am:
 	$(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM}
diff --git a/lib/libspl/asm-powerpc64/atomic.S b/lib/libspl/asm-powerpc64/atomic.S
new file mode 100644
index 0000000000..7550fd92b2
--- /dev/null
+++ b/lib/libspl/asm-powerpc64/atomic.S
@@ -0,0 +1,6 @@
+Stub file for 'make dist' distdir rule.
+
+This file is directly referenced by ../Makefile.am as a source
+file and thus will be expected by 'make dist'.  To avoid this
+being a problem this stub file was added.  It will be overwritten
+at build time based on assmebly generated from atomic.c.

From 01ff9d82d59afff679a124c479159e64389a61ff Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 1 Jul 2009 12:51:06 -0700
Subject: [PATCH 2/2] Install zfs_config, zfs_unconfig, symbols in to correct
 location. Provide a zfs.release file as part of the package.

---
 Makefile.am | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index dcdada493c..cb1fefa0aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,9 @@ distclean-local::
 
 if CONFIG_KERNEL
 install-data-local:
-	instdest=$(DESTDIR)/${prefix}/src/zfs-$(ZFS_META_VERSION); \
+	destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \
+	instdest=$(DESTDIR)/${prefix}/src/$$destname; \
+	echo "${ZFS_META_VERSION}" >$$instdest/zfs.release; \
 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
 	done