From cee94469b84bc9ccd985fcfce6d6ecd8d4d2909f Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 23 Aug 2019 12:58:38 -0500 Subject: [PATCH] Remove TOP_JLIBDIR In Makefile.config.in, the Makefile variable TOP_JLIBDIR is set to the autoconf variable TOP_JLIBDIR. Except, we don't export anything called TOP_JLIBDIR from autoconf, and never have. So, TOP_JLIBDIR gets set to the literal string @TOP_JLIBDIR@, which is useless. To get rid of this cruft, just remove references to this variable in the top-level Makefile.in and Makefile.config.in, where it was clearly not working. [mmeffie: Updated commit message after rebase.] Change-Id: Ic7e64d3743c99065dea8371bdc1007835c94edbd Reviewed-on: https://gerrit.openafs.org/13810 Tested-by: BuildBot Reviewed-by: Cheyenne Wills Reviewed-by: Michael Meffie --- Makefile.in | 4 ++-- src/config/Makefile.config.in | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index df4a98a157..85e29c46f3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -109,7 +109,7 @@ packages: dest echo Not building packages for ${SYS_NAME} ;; \ esac -${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/opr ${TOP_LIBDIR} ${TOP_JLIBDIR}: +${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/opr ${TOP_LIBDIR}: mkdir -p $@ install_dirs: force @@ -755,7 +755,7 @@ clean2: -(cd src/libafs; /bin/rm -rf afs afsint config rx) -(cd src/libuafs; /bin/rm -rf afs afsint config rx) -(cd tests ${COMPILE_CLEAN}) - -/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} ${TOP_JLIBDIR} + -/bin/rm -rf ${TOP_INCDIR} ${TOP_LIBDIR} -/bin/rm -rf libafs_tree ${SYS_NAME} dist: diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index d7434ded2a..6898718e2a 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -109,7 +109,6 @@ SHLIB_SUFFIX = @SHLIB_SUFFIX@ SYS_NAME = @AFS_SYSNAME@ TOP_INCDIR = @TOP_INCDIR@ TOP_LIBDIR = @TOP_LIBDIR@ -TOP_JLIBDIR= @TOP_JLIBDIR@ TOP_OBJDIR = @TOP_OBJDIR@ TOP_SRCDIR = @TOP_SRCDIR@ VPATH = ${srcdir}