? opencryptoki-include-fix.patch
Index: Makefile.am
===================================================================
RCS file: /cvsroot/opencryptoki/opencryptoki/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- Makefile.am	3 Jun 2005 18:18:35 -0000	1.2
+++ Makefile.am	11 Jan 2006 13:24:51 -0000
@@ -1,5 +1,5 @@
 SUBDIRS = usr testcases
-SPEC=rpm//openCryptoki-$(shell uname -m).spec
+SPEC=rpm//openCryptoki-$(host_cpu).spec
 
 rpm: ${SPEC}
 	rm -rf /usr/src/openCryptoki
Index: usr/include/pkcs11/Makefile.am
===================================================================
RCS file: /cvsroot/opencryptoki/opencryptoki/usr/include/pkcs11/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- usr/include/pkcs11/Makefile.am	1 Jun 2005 15:08:35 -0000	1.3
+++ usr/include/pkcs11/Makefile.am	11 Jan 2006 13:24:51 -0000
@@ -1,5 +1,5 @@
 opencryptoki_headers = apiclient.h pkcs11types.h pkcs11.h
 
-opencryptokiincludedir=$(DESTDIR)/$(includedir)/opencryptoki
+opencryptokiincludedir=$(includedir)/opencryptoki
 
 opencryptokiinclude_HEADERS = $(opencryptoki_headers)
Index: usr/lib/pkcs11/api/Makefile.am
===================================================================
RCS file: /cvsroot/opencryptoki/opencryptoki/usr/lib/pkcs11/api/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- usr/lib/pkcs11/api/Makefile.am	3 Aug 2005 02:43:41 -0000	1.28
+++ usr/lib/pkcs11/api/Makefile.am	11 Jan 2006 13:24:51 -0000
@@ -37,29 +37,3 @@
 	mkdir -p $(DESTDIR)/$(libdir)/opencryptoki/stdll
 	cd $(DESTDIR)/$(libdir)/pkcs11 && rm -f stdll && \
 		ln -sf ../opencryptoki/stdll/ stdll
-	-groupadd pkcs11
-	if test "x$(prefix)" = "x/usr"; then \
-		mkdir -p $(DESTDIR)/var/lib/opencryptoki ; \
-		chown root:pkcs11 $(DESTDIR)/var/lib/opencryptoki ; \
-		chmod 775 $(DESTDIR)/var/lib/opencryptoki ; \
-		if [ ! -L $(DESTDIR)/etc/pkcs11 ] ; then \
-			if [ -e $(DESTDIR)/etc/pkcs11/* ] ; then \
-				mv $(DESTDIR)/etc/pkcs11/* $(DESTDIR)/var/lib/opencryptoki ; \
-			fi ; \
-		fi ;\
-		cd $(DESTDIR)/etc && rm -rf pkcs11 && \
-			ln -sf $(DESTDIR)/var/lib/opencryptoki pkcs11 ; \
-	else \
-		mkdir -p $(DESTDIR)/$(localstatedir)/lib/opencryptoki ; \
-		chown root:pkcs11 $(DESTDIR)/$(localstatedir)/lib/opencryptoki ; \
-		chmod 775 $(DESTDIR)/$(localstatedir)/lib/opencryptoki ; \
-		if [ ! -L $(DESTDIR)/$(sysconfdir)/pkcs11 ] ; then \
-			if [ -e $(DESTDIR)/$(sysconfdir)/pkcs11/* ] ; then \
-				mv $(DESTDIR)/$(sysconfdir)/pkcs11/* \
-				$(DESTDIR)/$(localstatedir)/lib/opencryptoki ; \
-			fi ; \
-		fi ; \
-		mkdir -p $(DESTDIR)/$(sysconfdir) ; \
-		cd $(DESTDIR)/$(sysconfdir) && rm -rf pkcs11 && \
-			ln -sf $(DESTDIR)/$(localstatedir)/lib/opencryptoki pkcs11 ; \
-	fi
Index: usr/lib/pkcs11/methods/4758_status/Makefile.am
===================================================================
RCS file: /cvsroot/opencryptoki/opencryptoki/usr/lib/pkcs11/methods/4758_status/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- usr/lib/pkcs11/methods/4758_status/Makefile.am	22 Feb 2005 20:48:07 -0000	1.2
+++ usr/lib/pkcs11/methods/4758_status/Makefile.am	11 Jan 2006 13:25:00 -0000
@@ -11,6 +11,6 @@
 
 install-data-local:
 	mkdir -p $(INSROOT)/usr/lib/pkcs11/methods; \
-	if [ $(shell uname -m) != s390x ] ;then cp 4758_status \
+	if [ $(host_cpu) != s390x ] ;then cp 4758_status \
 	$(INSROOT)/usr/lib/pkcs11/methods/; fi; \
 	rm -f /tmp/4758*;