File openafs-1.6.x.layout.patch of Package openafs16
--- openafs-1.6.22.4/src/cf/dirpaths.m4.orig 2018-09-10 09:32:27.319733075 +0000
+++ openafs-1.6.22.4/src/cf/dirpaths.m4 2018-09-10 09:33:32.203730533 +0000
@@ -20,10 +20,10 @@
afssrvbindir=${afssrvbindir='${bindir}'}
afssrvsbindir=${afssrvsbindir='${sbindir}'}
afssrvlibexecdir=${afssrvlibexecdir='${libexecdir}/openafs'}
- afsdbdir=${afsdbdir='${localstatedir}/openafs/db'}
- afslogsdir=${afslogsdir='${localstatedir}/openafs/logs'}
- afslocaldir=${afslocaldir='${localstatedir}/openafs'}
- afsbackupdir=${afsbackupdir='${localstatedir}/openafs/backup'}
+ afsdbdir=${afsdbdir='/var/lib/openafs/db'}
+ afslogsdir=${afslogsdir='/var/log/openafs'}
+ afslocaldir=${afslocaldir='/var/lib/openafs'}
+ afsbackupdir=${afsbackupdir='/var/lib/openafs/backup'}
afsbosconfigdir=${afsbosconfigdir='${sysconfdir}/openafs'}
afsdatadir=${afsdatadir='${datadir}/openafs'}
fi
--- openafs-1.6.0pre1/src/rxstat/Makefile.in.orig 2010-12-21 07:12:35.000000000 +0100
+++ openafs-1.6.0pre1/src/rxstat/Makefile.in 2010-12-21 07:26:34.000000000 +0100
@@ -69,8 +69,10 @@
install: rxstat.h librxstat.a
${INSTALL} -d ${DESTDIR}${includedir}/rx
${INSTALL} -d ${DESTDIR}${libdir}
- ${INSTALL_DATA} rxstat.h ${DESTDIR}${includedir}/rx/rxstat.h
- ${INSTALL_DATA} librxstat.a ${DESTDIR}${libdir}/librxstat.a
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs/rx
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL_DATA} rxstat.h ${DESTDIR}${includedir}/afs/rx/rxstat.h
+ ${INSTALL_DATA} librxstat.a ${DESTDIR}${libdir}/afs/librxstat.a
dest: rxstat.h librxstat.a
${INSTALL} -d ${DEST}/include/rx
--- openafs-1.6.0pre1/src/libafsrpc/Makefile.in.orig 2010-12-21 07:02:28.000000000 +0100
+++ openafs-1.6.0pre1/src/libafsrpc/Makefile.in 2010-12-21 07:26:59.000000000 +0100
@@ -418,7 +418,8 @@
install: libafsrpc.a
${INSTALL} -d ${DESTDIR}${libdir}
- ${INSTALL_DATA} libafsrpc.a ${DESTDIR}${libdir}/libafsrpc.a
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL_DATA} libafsrpc.a ${DESTDIR}${libdir}/afs/libafsrpc.a
dest: libafsrpc.a
${INSTALL} -d ${DEST}/lib
--- openafs-1.6.0pre1/src/ubik/Makefile.in.orig 2010-12-21 07:14:49.000000000 +0100
+++ openafs-1.6.0pre1/src/ubik/Makefile.in 2010-12-21 07:27:11.000000000 +0100
@@ -143,9 +143,11 @@
install: libubik.a ubik.h ubik_int.h udebug
${INSTALL} -d ${DESTDIR}${libdir}
${INSTALL} -d ${DESTDIR}${includedir}
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs
${INSTALL} -d ${DESTDIR}${bindir}
${INSTALL} -d ${DESTDIR}${afssrvbindir}
- ${INSTALL_DATA} libubik.a ${DESTDIR}${libdir}/libubik.a
+ ${INSTALL_DATA} libubik.a ${DESTDIR}${libdir}/afs/libubik.a
${INSTALL_DATA} ubik.h ${DESTDIR}${includedir}/ubik.h
${INSTALL_DATA} ubik_int.h ${DESTDIR}${includedir}/ubik_int.h
${INSTALL_PROGRAM} udebug ${DESTDIR}${bindir}/udebug
--- openafs-1.6.0pre1/src/lwp/Makefile.in.orig 2010-12-21 07:07:04.000000000 +0100
+++ openafs-1.6.0pre1/src/lwp/Makefile.in 2010-12-21 07:27:20.000000000 +0100
@@ -182,7 +182,8 @@
install: liblwp.a lock.h lwp.h preempt.h timer.h
${INSTALL} -d ${DESTDIR}${libdir}
${INSTALL} -d ${DESTDIR}${includedir}
- ${INSTALL_DATA} liblwp.a ${DESTDIR}${libdir}/liblwp.a
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL_DATA} liblwp.a ${DESTDIR}${libdir}/afs/liblwp.a
${INSTALL_DATA} ${srcdir}/lock.h ${DESTDIR}${includedir}/lock.h
${INSTALL_DATA} ${srcdir}/lwp.h ${DESTDIR}${includedir}/lwp.h
${INSTALL_DATA} ${srcdir}/preempt.h ${DESTDIR}${includedir}/preempt.h
--- openafs-1.6.0pre1/src/rx/Makefile.in.orig 2010-12-21 07:09:16.000000000 +0100
+++ openafs-1.6.0pre1/src/rx/Makefile.in 2010-12-21 07:27:32.000000000 +0100
@@ -153,8 +153,10 @@
install: librx.a
${INSTALL} -d ${DESTDIR}${libdir}
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs/rx
${INSTALL} -d ${DESTDIR}${includedir}/rx
- ${INSTALL_DATA} librx.a ${DESTDIR}${libdir}/librx.a
+ ${INSTALL_DATA} librx.a ${DESTDIR}${libdir}/afs/librx.a
${INSTALL_DATA} ${srcdir}/rx_packet.h ${DESTDIR}${includedir}/rx/rx_packet.h
${INSTALL_DATA} ${srcdir}/rx_prototypes.h ${DESTDIR}${includedir}/rx/rx_prototypes.h
${INSTALL_DATA} ${srcdir}/rx.h ${DESTDIR}${includedir}/rx/rx.h
--- openafs-1.6.0pre1/src/libafsauthent/Makefile.in.orig 2010-12-21 07:04:37.000000000 +0100
+++ openafs-1.6.0pre1/src/libafsauthent/Makefile.in 2010-12-21 07:25:53.000000000 +0100
@@ -277,7 +277,8 @@
install: libafsauthent.a
${INSTALL} -d ${DESTDIR}${libdir}
- ${INSTALL_DATA} libafsauthent.a ${DESTDIR}${libdir}/libafsauthent.a
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL_DATA} libafsauthent.a ${DESTDIR}${libdir}/afs/libafsauthent.a
dest: libafsauthent.a
${INSTALL} -d ${DEST}/lib
--- openafs-1.6.0pre1/src/rxkad/Makefile.in.orig 2010-12-21 07:10:35.000000000 +0100
+++ openafs-1.6.0pre1/src/rxkad/Makefile.in 2010-12-21 07:26:09.000000000 +0100
@@ -108,7 +108,9 @@
install: librxkad.a fcrypt.h rxkad.h rxkad_prototypes.h
${INSTALL} -d ${DESTDIR}${libdir}
${INSTALL} -d ${DESTDIR}${includedir}/rx
- ${INSTALL_DATA} librxkad.a ${DESTDIR}${libdir}/librxkad.a
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs/rx
+ ${INSTALL_DATA} librxkad.a ${DESTDIR}${libdir}/afs/librxkad.a
${INSTALL_DATA} ${srcdir}/fcrypt.h ${DESTDIR}${includedir}/rx/fcrypt.h
${INSTALL_DATA} rxkad.h ${DESTDIR}${includedir}/rx/rxkad.h
${INSTALL_DATA} ${srcdir}/rxkad_prototypes.h \
--- openafs-1.6.0pre1/src/des/Makefile.in.orig 2010-12-21 07:19:47.000000000 +0100
+++ openafs-1.6.0pre1/src/des/Makefile.in 2010-12-21 07:26:18.000000000 +0100
@@ -205,7 +205,9 @@
install: libdes.a des.h des_prototypes.h des_conf.h mit-cpyright.h odd.h
${INSTALL} -d ${DESTDIR}${libdir}
${INSTALL} -d ${DESTDIR}${includedir}
- ${INSTALL_DATA} libdes.a ${DESTDIR}${libdir}/libdes.a
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs
+ ${INSTALL_DATA} libdes.a ${DESTDIR}${libdir}/afs/libdes.a
${INSTALL_DATA} ${srcdir}/des.h ${DESTDIR}${includedir}/des.h
${INSTALL_DATA} ${srcdir}/des_prototypes.h ${DESTDIR}${includedir}/des_prototypes.h
${INSTALL_DATA} ${srcdir}/des_conf.h ${DESTDIR}${includedir}/des_conf.h
--- openafs-1.6.0pre1/src/libuafs/Makefile.common.in.orig 2010-12-27 12:11:20.000000000 +0100
+++ openafs-1.6.0pre1/src/libuafs/Makefile.common.in 2010-12-27 12:11:46.000000000 +0100
@@ -1462,8 +1462,8 @@
install: UAFS/$(LIBUAFS) JUAFS/$(LIBJUAFS)
${INSTALL} -d ${DESTDIR}${libdir}
- ${INSTALL_DATA} UAFS/$(LIBUAFS) ${DESTDIR}${libdir}/$(LIBUAFS)
- ${INSTALL_DATA} JUAFS/$(LIBJUAFS) ${DESTDIR}${libdir}/$(LIBJUAFS)
+ ${INSTALL_DATA} UAFS/$(LIBUAFS) ${DESTDIR}${libdir}/afs/$(LIBUAFS)
+ ${INSTALL_DATA} JUAFS/$(LIBJUAFS) ${DESTDIR}${libdir}/afs/$(LIBJUAFS)
dest: $(TOP_INCDIR)/afs/param.h $(TOP_INCDIR)/afs/stds.h \
$(TOP_INCDIR)/afs/afs_sysnames.h \
--- openafs-1.6.0pre1/src/shlibafsauthent/Makefile.in.orig 2010-12-27 19:59:38.000000000 +0100
+++ openafs-1.6.0pre1/src/shlibafsauthent/Makefile.in 2010-12-27 20:01:57.000000000 +0100
@@ -117,11 +117,11 @@
${INSTALL_DATA} libafsauthent_pic.a $@
install: ${LIBAFSAUTHENT} libafsauthent_pic.a
- ../config/shlib-install -d ${DESTDIR}${libdir} \
+ ../config/shlib-install -d ${DESTDIR}${libdir}/afs \
-l libafsauthent \
-M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR}
${INSTALL_DATA} libafsauthent_pic.a \
- ${DESTDIR}${libdir}/libafsauthent_pic.a
+ ${DESTDIR}${libdir}/afs/libafsauthent_pic.a
dest: ${LIBAFSAUTHENT} libafsauthent_pic.a
../config/shlib-install -d ${DEST}/lib \
--- openafs-1.6.0pre1/src/shlibafsrpc/Makefile.in.orig 2010-12-27 20:02:09.000000000 +0100
+++ openafs-1.6.0pre1/src/shlibafsrpc/Makefile.in 2010-12-27 20:02:33.000000000 +0100
@@ -150,9 +150,9 @@
${INSTALL_DATA} libafsrpc_pic.a $@
install: ${LIBAFSRPC} libafsrpc_pic.a
- ../config/shlib-install -d ${DESTDIR}${libdir} \
+ ../config/shlib-install -d ${DESTDIR}${libdir}/afs \
-l libafsrpc -M ${LIBAFSRPCMAJOR} -m ${LIBAFSRPCMINOR}
- ${INSTALL_DATA} libafsrpc_pic.a ${DESTDIR}${libdir}/libafsrpc_pic.a
+ ${INSTALL_DATA} libafsrpc_pic.a ${DESTDIR}${libdir}/afs/libafsrpc_pic.a
dest: ${LIBAFSRPC} libafsrpc_pic.a
../config/shlib-install -d ${DEST}/lib \
--- openafs-1.6.0pre1/src/kopenafs/Makefile.in.or 2010-12-28 07:10:46.000000000 +0100
+++ openafs-1.6.0pre1/src/kopenafs/Makefile.in 2010-12-28 07:13:16.000000000 +0100
@@ -103,11 +103,11 @@
# Installation targets
#
install: ${LIBKOPENAFS}
- ${INSTALL} -d ${DESTDIR}${libdir}
- ${INSTALL} -d ${DESTDIR}${includedir}
- ${INSTALL_DATA} libkopenafs.a ${DESTDIR}${libdir}/libkopenafs.a
- ${INSTALL_DATA} ${srcdir}/kopenafs.h ${DESTDIR}${includedir}/kopenafs.h
- ../config/shlib-install -d ${DESTDIR}${libdir} \
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
+ ${INSTALL} -d ${DESTDIR}${includedir}/afs
+ ${INSTALL_DATA} libkopenafs.a ${DESTDIR}${libdir}/afs/libkopenafs.a
+ ${INSTALL_DATA} ${srcdir}/kopenafs.h ${DESTDIR}${includedir}/afs/kopenafs.h
+ ../config/shlib-install -d ${DESTDIR}${libdir}/afs \
-l libkopenafs -M ${MAJOR} -m ${MINOR}
dest: ${LIBKOPENAFS}
--- openafs-1.6.10pre1/src/libafscp/Makefile.in.orig 2014-08-14 01:04:46.518396989 +0200
+++ openafs-1.6.10pre1/src/libafscp/Makefile.in 2014-08-14 01:05:23.886726012 +0200
@@ -78,9 +78,9 @@
# Install targets
#
install: all
- ${INSTALL} -d ${DESTDIR}${libdir}
+ ${INSTALL} -d ${DESTDIR}${libdir}/afs
${INSTALL} -d ${DESTDIR}${includedir}/afs
- ${INSTALL_DATA} libafscp.a ${DESTDIR}${libdir}/libafscp.a
+ ${INSTALL_DATA} libafscp.a ${DESTDIR}${libdir}/afs/libafscp.a
${INSTALL_DATA} ${srcdir}/afscp.h ${DESTDIR}${includedir}/afs/afscp.h
dest: all