From b38f3226b5fc65a9060a1151cfdf087f980ce38f Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 May 2006 12:01:40 +0000 Subject: [PATCH] SALOME versioning system improvement --- Makefile.in | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index f16b2d86..d3bb4050 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,7 +28,8 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl + @COMMENCE@ @@ -37,18 +38,23 @@ SUBDIRS = idl src doc adm_local BIN_SCRIPT= \ VERSION - +# copy header files in common directory include_list = include/salome/SALOMEconfig.h \ include/salome/VISU_version.h -# copy header files in common directory ifneq ($(HAVE_SSTREAM),yes) include_list += include/salome/sstream endif inc: idl $(include_list) +bin: bin/salome/VERSION + +bin/salome/VERSION : bin/VERSION + -$(RM) $@ + $(LN_S) ../../$< $@ + include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref -$(RM) $@ $(LN_S) ../../$< $@ @@ -67,7 +73,8 @@ include/salome/sstream: salome_adm/unix/sstream $(LN_S) ../../$< $@ include/salome/VISU_version.h: VISU_version.h - cp $< $@ + -$(RM) $@ + $(LN_S) ../../$< $@ depend: depend_idl @@ -119,3 +126,8 @@ distclean-other: install: install-bin install-include install-end +install-resources: install-catalog + +install-catalog: share/salome/resources/VISUCatalog.xml + $(INSTALL) -d $(datadir)/resources + $(INSTALL_DATA) $< $(datadir)/resources/. -- 2.39.2