From 8b71a42f8278ede64ccbc4aab716a7da6d4c73f7 Mon Sep 17 00:00:00 2001 From: Hades DAQ Date: Fri, 1 Feb 2013 01:25:03 +0100 Subject: [PATCH] changed to be able to compile from script 3, mt --- README | 2 +- allParam/Makefile | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 7bd7c36..3a0456e 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ $ ./make_script.pl in the main directory of daqdata. -Then add the path $HOME/daqdate to your PATH environment variable. +Then add the path of the daqdata/bin to your PATH environment variable. #2013-01-31 MT diff --git a/allParam/Makefile b/allParam/Makefile index 5ce2ad2..31b2dec 100644 --- a/allParam/Makefile +++ b/allParam/Makefile @@ -210,18 +210,18 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print VPATH = . ./ora -ACLOCAL = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run aclocal-1.12 +ACLOCAL = ${SHELL} /home/hadaq/daqdata4/allParam/config/missing --run aclocal-1.12 ALLPARAM_H = include/allParam.h AMTAR = $${TAR-tar} -AUTOCONF = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run autoconf -AUTOHEADER = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run autoheader -AUTOMAKE = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run automake-1.12 +AUTOCONF = ${SHELL} /home/hadaq/daqdata4/allParam/config/missing --run autoconf +AUTOHEADER = ${SHELL} /home/hadaq/daqdata4/allParam/config/missing --run autoheader +AUTOMAKE = ${SHELL} /home/hadaq/daqdata4/allParam/config/missing --run automake-1.12 AWK = gawk CC = gcc -ansi CCDEPMODE = depmode=gcc3 CFLAGS = -Wall -pedantic -g -O3 -fconserve-space -finline-functions CPP = gcc -E -CPPFLAGS = -I/home/hadaq/daqdata3/include +CPPFLAGS = -I/home/hadaq/daqdata4/include CXX = g++ -ansi CXXDEPMODE = depmode=gcc3 CXXFLAGS = -Wall -pedantic -g -O3 -fconserve-space -finline-functions @@ -239,7 +239,7 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_PROGRAM = ${INSTALL} INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -LDFLAGS = -L/home/hadaq/daqdata3/lib64 +LDFLAGS = -L/home/hadaq/daqdata4/lib64 LIBCAPARAM_A = LIBFILEPARAM_A = LIBOBJS = @@ -249,7 +249,7 @@ LIBS = -ltcl8.5 -lpthread LIBTCLPARAM_A = libtclParam.a libtclParam_p.a LTLIBOBJS = MAINT = # -MAKEINFO = ${SHELL} /home/hadaq/daqdata3/allParam/config/missing --run makeinfo +MAKEINFO = ${SHELL} /home/hadaq/daqdata4/allParam/config/missing --run makeinfo MKDIR_P = /bin/mkdir -p OBJEXT = o PACKAGE = allParam @@ -269,10 +269,10 @@ SET_MAKE = SHELL = /bin/sh STRIP = VERSION = 0.4 -abs_builddir = /home/hadaq/daqdata3/allParam -abs_srcdir = /home/hadaq/daqdata3/allParam -abs_top_builddir = /home/hadaq/daqdata3/allParam -abs_top_srcdir = /home/hadaq/daqdata3/allParam +abs_builddir = /home/hadaq/daqdata4/allParam +abs_srcdir = /home/hadaq/daqdata4/allParam +abs_top_builddir = /home/hadaq/daqdata4/allParam +abs_top_srcdir = /home/hadaq/daqdata4/allParam ac_ct_CC = gcc ac_ct_CXX = g++ am__include = include @@ -292,7 +292,7 @@ host_alias = htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/hadaq/daqdata3/allParam/config/install-sh +install_sh = ${SHELL} /home/hadaq/daqdata4/allParam/config/install-sh libdir = ${exec_prefix}/lib64 libexecdir = ${exec_prefix}/lib localedir = ${datarootdir}/locale @@ -301,7 +301,7 @@ mandir = ${datarootdir}/man mkdir_p = /bin/mkdir -p oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /home/hadaq/daqdata3 +prefix = /home/hadaq/daqdata4 program_transform_name = s,$$,_tcl, psdir = ${docdir} sbindir = ${exec_prefix}/sbin -- 2.43.0