From: Russ Allbery <rra@debian.org>
Date: Tue, 6 Apr 2010 21:43:01 +0000 (-0700)
Subject: Remove build system divergences due to DFSG repackaging
X-Git-Tag: debian/1.5.73.3-1~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=393914aad3e4ed1b7161bf4c86ed074373e18962;p=packages%2Fo%2Fopenafs.git

Remove build system divergences due to DFSG repackaging

Now that upstream has rewritten all APSL-licensed code, remove the build
system adjustments for the repackaging we'd previously had to do.
---

diff --git a/configure.in b/configure.in
index 18047714e..93e4b8c6d 100644
--- a/configure.in
+++ b/configure.in
@@ -108,6 +108,12 @@ src/log/test/Makefile \
 src/lwp/Makefile \
 src/lwp/test/Makefile \
 src/packaging/Debian/rules \
+src/packaging/MacOS/OpenAFS-debug.Description.plist \
+src/packaging/MacOS/OpenAFS-debug.Info.plist \
+src/packaging/MacOS/OpenAFS.Description.plist \
+src/packaging/MacOS/OpenAFS.Info.plist \
+src/packaging/MacOS/OpenAFS.info \
+src/packaging/MacOS/buildpkg.sh \
 src/packaging/RedHat/openafs.spec \
 src/pam/Makefile \
 src/platform/Makefile \
diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index d396af1d5..9f4864f3c 100644
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -47,7 +47,8 @@ depinstall: afszcm.cat AFS_component_version_number.c \
 	${TOP_INCDIR}/afs/afs_stats.h \
 	${TOP_INCDIR}/afs/exporter.h \
 	${TOP_INCDIR}/afs/nfsclient.h \
-	${TOP_INCDIR}/afs/unified_afs.h
+	${TOP_INCDIR}/afs/unified_afs.h \
+	${TOP_INCDIR}/afs/sysctl.h
 
 ${TOP_INCDIR}/afs/afs_consts.h: afs_consts.h
 	${INSTALL_DATA} $? $@
@@ -82,6 +83,7 @@ install: unified_afs.h
 	${INSTALL_DATA} nfsclient.h ${DESTDIR}${includedir}/afs/nfsclient.h
 	${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h \
 	    ${DESTDIR}${includedir}/afs/osi_inode.h
+	${INSTALL_DATA} sysctl.h ${DESTDIR}${includedir}/afs/sysctl.h
 	${INSTALL_DATA} unified_afs.h ${DESTDIR}${includedir}/afs/unified_afs.h
 	case ${SYS_NAME} in \
 	    i386_fbsd*) \
@@ -106,6 +108,7 @@ dest: unified_afs.h
 	${INSTALL_DATA} exporter.h ${DEST}/include/afs/exporter.h
 	${INSTALL_DATA} nfsclient.h ${DEST}/include/afs/nfsclient.h
 	${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h ${DEST}/include/afs/osi_inode.h
+	${INSTALL_DATA} sysctl.h ${DEST}/include/afs/sysctl.h
 	${INSTALL_DATA} unified_afs.h ${DEST}/include/afs/unified_afs.h
 	case ${SYS_NAME} in \
 	    i386_fbsd*) \
diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 86140e4a7..464b6ce08 100644
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -36,7 +36,7 @@ DIROBJS=buffer.o dir.o salvage.o
 
 LWPOBJS=lock.o threadname.o
 
-UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o
+UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o
 
 VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync-client.o \
 	 clone.o nuke.o devname.o listinodes.o ihandle.o \
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 12d51cf2c..c39998fd6 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -16,7 +16,7 @@ HELPER_SPLINT=@HELPER_SPLINT@
 
 objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
 	 hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
-	 dirpath.o fileutil.o netutils.o flipbase64.o \
+	 dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
 	 afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o strnlen.o \
 	 pthread_glock.o daemon.o rxkstats.o ${REGEX_OBJ}