diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index cb1fe0f82..ba8a37390 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -10,6 +10,7 @@ $(info ) DESTDIR ?= ../bin +LIBDIR ?= ../bin PROG = $(DESTDIR)/slsDetectorGui DOCDIR ?= docs @@ -46,7 +47,7 @@ clean: Makefile.gui: mm mm: - qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' + qmake -set QT_INSTALL_PREFIX $(QTDIR) && qmake -o Makefile.gui INCLUDES='$(INCLUDES)' DESTDIR=$(DESTDIR) SLSDETLIB=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' LIBDIR='$(LIBDIR)' doc: cd manual && $(MAKE) DESTDIR=$(DOCDIR) @@ -55,7 +56,7 @@ htmldoc: cd manual && $(MAKE) html DESTDIR=$(DOCDIR) $(PROG): Makefile slsDetectorGui.pro $(DIR) - $(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' + $(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)' guiclient: # echo $(WD) diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 1abff021b..eb8065664 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repsitory UUID: 9794596be92a600d19395eb6bf7818ae5e0a68f7 -Revision: 398 +Repsitory UUID: 0da39fb3680d6eb9d8a9871cb9e6a152ee638046 +Revision: 399 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 398 -Last Changed Date: 2017-06-29 10:18:51 +0200 +Last Changed Rev: 399 +Last Changed Date: 2017-06-29 17:09:46 +0200 diff --git a/slsDetectorGui/gitInfoGui.h b/slsDetectorGui/gitInfoGui.h index 0d4e7bd79..0a8696884 100644 --- a/slsDetectorGui/gitInfoGui.h +++ b/slsDetectorGui/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "9794596be92a600d19395eb6bf7818ae5e0a68f7" -//#define SVNREV 0x398 +#define SVNREPUUID "0da39fb3680d6eb9d8a9871cb9e6a152ee638046" +//#define SVNREV 0x399 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x398 +#define SVNREV 0x399 #define SVNDATE 0x20170629 //