From a6c51105373e61533c1b2959e819342383945c55 Mon Sep 17 00:00:00 2001 From: Eduard Valeyev Date: Sun, 19 Sep 2021 14:12:29 -0400 Subject: [PATCH] [compiler] removed install_cmake target, fixes compiler's install target resolves #222 --- CHANGES | 4 +++- Makefile | 8 +------- configure.ac | 7 ------- src/lib/MakeRules.in | 6 ------ src/lib/MakeVars.in | 1 - 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index 87d3ed2f2..f1e548590 100644 --- a/CHANGES +++ b/CHANGES @@ -4,7 +4,9 @@ Following is a brief summary of changes made in each release of Libint. - 2021-xx-yy: 2.7.1 - - fixed tracking of shell-pair data + - PR 224: fixed tracking of shell-pair data + - PR 223: removed redundant const qualifier (HT @e-kwsm) + - issue 222: fixed compiler tree's install target - 2021-09-14: 2.7.0 - precision tracking of shell-pair data, respected by Engine::compute2 diff --git a/Makefile b/Makefile index 59b145ece..460c286a3 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ export:: done (cd export && $(MAKE) $(DODEPENDOPT) export) || exit 1; -install:: all install_pkgconfig install_cmake install_inc install_data +install:: all install_pkgconfig install_inc install_data for dir in $(SUBDIRS); \ do \ (cd $${dir} && $(MAKE) $(DODEPENDOPT) install) || exit 1; \ @@ -42,12 +42,6 @@ install_pkgconfig:: $(INSTALL) $(INSTALLLIBOPT) $(TOPDIR)/libint2.pc $(DESTDIR)$(pkgconfigdir) endif -ifdef cmakedir -install_cmake:: - $(INSTALL) $(INSTALLDIROPT) $(DESTDIR)$(cmakedir) - $(INSTALL) $(INSTALLLIBOPT) $(SRCTOPDIR)/FindLibint2.cmake $(DESTDIR)$(cmakedir) -endif - install_data:: $(INSTALL) $(INSTALLDIROPT) $(DESTDIR)$(datadir)/basis $(INSTALL) $(INSTALLLIBOPT) $(SRCTOPDIR)/lib/basis/* $(DESTDIR)$(datadir)/basis diff --git a/configure.ac b/configure.ac index a88dd343c..fa391a588 100644 --- a/configure.ac +++ b/configure.ac @@ -1071,13 +1071,6 @@ PKGCONFIGDIR=$withval ) AC_SUBST(PKGCONFIGDIR) -CMAKEDIR='$(libdir)/cmake/libint2' -AC_ARG_WITH(cmakedir, -AS_HELP_STRING([--with-cmakedir],[Specifies the location to put FindLibint2.cmake file. Default is $(libdir)/cmake/libint2.]), -CMAKEDIR=$withval -) -AC_SUBST(CMAKEDIR) - dnl --------- Want absolute path for srcdir, not relative. --------- if test X$ac_srcdir_defaulted = Xyes; then diff --git a/src/lib/MakeRules.in b/src/lib/MakeRules.in index 13d4c7d10..1817125d2 100644 --- a/src/lib/MakeRules.in +++ b/src/lib/MakeRules.in @@ -50,12 +50,6 @@ install_pkgconfig:: $(INSTALL) $(INSTALLLIBOPT) $(TOPDIR)/libint2.pc $(DESTDIR)$(pkgconfigdir) endif -ifdef cmakedir -install_cmake:: - $(INSTALL) $(INSTALLDIROPT) $(DESTDIR)$(cmakedir) - $(INSTALL) $(INSTALLLIBOPT) $(SRCTOPDIR)/FindLibint2.cmake $(DESTDIR)$(cmakedir) -endif - install_data:: $(INSTALL) $(INSTALLDIROPT) $(DESTDIR)$(datadir)/basis $(INSTALL) $(INSTALLLIBOPT) $(SRCTOPDIR)/lib/basis/* $(DESTDIR)$(datadir)/basis diff --git a/src/lib/MakeVars.in b/src/lib/MakeVars.in index bd6312077..977be39bf 100644 --- a/src/lib/MakeVars.in +++ b/src/lib/MakeVars.in @@ -89,7 +89,6 @@ bindir=@bindir@ libdir=@libdir@ includedir=@libintincludedir@ pkgconfigdir=@PKGCONFIGDIR@ -cmakedir=@CMAKEDIR@ datadir=@datarootdir@/libint/$(LIBINT_VERSION) RANLIB = @RANLIB@