added certs.kfg to list of dependencies

biobuilds · Oct 3, 2016 · 23d76ee · 23d76ee
1 parent 4c3d122
commit 23d76ee
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/build/Makefile.deb b/build/Makefile.deb
@@ -54,8 +54,15 @@ else
 deb: $(DEB)
 endif
 
-$(DEB): $(DST)/etc/ncbi/default.kfg $(DST)/etc/ncbi/schema.kfg \
-	$(DST)/etc/ncbi/vdb-copy.kfg $(DST)/usr/bin $(DST)/DEBIAN/control
+DEB_DEPS =                       \
+	$(DST)/etc/ncbi/default.kfg  \
+	$(DST)/etc/ncbi/certs.kfg    \
+	$(DST)/etc/ncbi/schema.kfg   \
+	$(DST)/etc/ncbi/vdb-copy.kfg \
+	$(DST)/usr/bin               \
+	$(DST)/DEBIAN/control
+
+$(DEB): $(DEB_DEPS)
 ifeq (mac,$(OS))
 	         dpkg-deb --build $(DST)
 else
@@ -75,6 +82,9 @@ $(DST)/etc/ncbi:
 $(DST)/etc/ncbi/default.kfg: $(DST)/etc/ncbi
 	rsync $(VERBOSE) -l --chmod=g-w $(VDB_LIBDIR)/ncbi/default.kfg $@
 
+$(DST)/etc/ncbi/certs.kfg: $(DST)/etc/ncbi
+	rsync $(VERBOSE) -l --chmod=g-w $(VDB_LIBDIR)/ncbi/certs.kfg $@
+
 $(DST)/etc/ncbi/schema.kfg: $(DST)/etc/ncbi
 	echo '/vdb/schema/paths = "/usr/share/ncbi/schema"' > $@
 

diff --git a/build/Makefile.env b/build/Makefile.env
@@ -125,6 +125,7 @@ else
 endif
 
 DEFAULT_KFG = $(VDB_SRCDIR)/libs/kfg/default.kfg
+CERTS_KFG = $(VDB_SRCDIR)/libs/kfg/certs.kfg
 
 # make reissue command
 MAKE_CMD = $(MAKE) BUILD=$(BUILD) TOOLSET=$(TOOLSET) COMP=$(COMP) LNKG=$(LNKG) \
@@ -159,8 +160,12 @@ $(BINDIR)/ncbi/default.kfg: $(DEFAULT_KFG)
 	@ mkdir -p $(NCBIDIR)
 	@ cp -v $(DEFAULT_KFG) $@
 
+$(BINDIR)/ncbi/certs.kfg: $(CERTS_KFG)
+	@ mkdir -p $(NCBIDIR)
+	@ cp -v $(CERTS_KFG) $@
+
 # create all required output directories
-makedirs: $(BINDIR)/ncbi/default.kfg
+makedirs: $(BINDIR)/ncbi/default.kfg $(BINDIR)/ncbi/certs.kfg
 	@ mkdir -p $(addprefix $(TARGDIR)/,$(SUBDIRS) obj/$(MODULE)) $(NCBIDIR)
 
 makejdirs:

diff --git a/build/Makefile.install b/build/Makefile.install
@@ -76,6 +76,8 @@ ifeq (true, $(LINUX_ROOT))
 	  cp -p $(TOP)/tools/vdb-copy/vdb-copy.kfg $(ROOT)/etc/ncbi ; \
 	  if [ -f $(BINDIR)/ncbi/default.kfg ] ; \
 	    then cp -p $(BINDIR)/ncbi/default.kfg $(ROOT)/etc/ncbi ; \
+	  fi; if [ -f $(BINDIR)/ncbi/certs.kfg ] ; \
+	    then cp -p $(BINDIR)/ncbi/certs.kfg $(ROOT)/etc/ncbi ; \
 	  fi ) && echo done
 	@ #
 	@ echo "Updating $(PROFILE_FILE).[c]sh"
@@ -98,6 +100,8 @@ else
 	  cp -p $(TOP)/tools/vdb-copy/vdb-copy.kfg $(INST_BINDIR)/ncbi/ ; \
 	  if [ -f $(BINDIR)/ncbi/default.kfg ] ; \
 	    then cp -p $(BINDIR)/ncbi/default.kfg $(INST_BINDIR)/ncbi ; \
+	  fi; if [ -f $(BINDIR)/ncbi/certs.kfg ] ; \
+	    then cp -p $(BINDIR)/ncbi/certs.kfg $(INST_BINDIR)/ncbi ; \
 	  fi ) && echo done
 endif
 

diff --git a/build/Makefile.rpm b/build/Makefile.rpm
@@ -56,8 +56,14 @@ $(RPM): $(SPEC) $(SRC)
 	rpmbuild --define "_topdir $(PKGDIR)"  --define "_tmppath %{_topdir}/tmp" \
 	    -bb $(SPEC)
 
-$(SRC): $(DST)/etc/ncbi/default.kfg $(DST)/etc/ncbi/schema.kfg \
-		$(DST)/etc/ncbi/vdb-copy.kfg $(DST)/usr/share/ncbi/schema
+SRC_DEPS =                       \
+	$(DST)/etc/ncbi/default.kfg  \
+	$(DST)/etc/ncbi/certs.kfg    \
+	$(DST)/etc/ncbi/schema.kfg   \
+	$(DST)/etc/ncbi/vdb-copy.kfg \
+	$(DST)/usr/share/ncbi/schema
+
+$(SRC): $(SRC_DEPS)
 	echo 'DEBUGGING RPM: (SRC)'
 	chmod -R g-w $(DST)
 	cd $(PKGDIR) ; tar $(VERBOSE) -zcf $(TGZ) --owner 0 --group 0 \
@@ -69,6 +75,10 @@ $(DST)/etc/ncbi/default.kfg: $(DST)
 	echo 'DEBUGGING RPM: (/etc/ncbi/default.kfg)'
 	rsync $(VERBOSE) -l --chmod=g-w $(VDB_LIBDIR)/ncbi/default.kfg $@
 
+$(DST)/etc/ncbi/certs.kfg: $(DST)
+	echo 'DEBUGGING RPM: (/etc/ncbi/certs.kfg)'
+	rsync $(VERBOSE) -l --chmod=g-w $(VDB_LIBDIR)/ncbi/certs.kfg $@
+
 $(DST)/etc/ncbi/schema.kfg: $(DST)
 	echo 'DEBUGGING RPM: (/etc/ncbi/schema.kfg)'
 	echo '/vdb/schema/paths = "/usr/share/ncbi/schema"' > $@