[oprof-cvs] CVS: oprofile/gui Makefile.am,1.7,1.8 oprof_start.cpp,1.71,1.72

[Philippe E. <ph...@us...>]

Update of /cvsroot/oprofile/oprofile/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv27541/gui

Modified Files:
	Makefile.am oprof_start.cpp 
Log Message:

remove -DBINDIR -DDATADIR but get install path name through configure

regards,
Phil


Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	15 Nov 2002 15:22:09 -0000	1.7
+++ Makefile.am	23 Feb 2003 18:17:21 -0000	1.8
@@ -7,7 +7,7 @@
 
 if have_qt
 
-AM_CPPFLAGS = @QT_INCLUDES@ -I ${top_srcdir}/libop -I ${top_srcdir}/libutil++ -I ${top_srcdir}/libutil -DBINDIR=\"$(bindir)\" -DKVERSION=\"@KVERS@\"
+AM_CPPFLAGS = @QT_INCLUDES@ -I ${top_srcdir}/libop -I ${top_srcdir}/libutil++ -I ${top_srcdir}/libutil -DKVERSION=\"@KVERS@\"
 
 bin_PROGRAMS = oprof_start
 

Index: oprof_start.cpp
===================================================================
RCS file: /cvsroot/oprofile/oprofile/gui/oprof_start.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- oprof_start.cpp	19 Feb 2003 02:10:26 -0000	1.71
+++ oprof_start.cpp	23 Feb 2003 18:17:21 -0000	1.72
@@ -37,6 +37,7 @@
 #include "op_config.h"
 #include "op_config_24.h"
 #include "string_manip.h"
+#include "version.h"
 
 using namespace std;
 
@@ -65,7 +66,7 @@
 	vector<string> args;
 	args.push_back("--init");
 
-	if (do_exec_command(BINDIR "/opcontrol", args))
+	if (do_exec_command(OP_INSTALL_PATH "/bin/opcontrol", args))
 		exit(EXIT_FAILURE);
 
 	cpu_type = op_get_cpu_type();
@@ -738,7 +739,7 @@
 	args.push_back("--dump");
 
 	if (daemon_status().running)
-		do_exec_command(BINDIR "/opcontrol", args);
+		do_exec_command(OP_INSTALL_PATH "/bin/opcontrol", args);
 	else
 		QMessageBox::warning(this, 0, "The profiler is not started.");
 }
@@ -864,7 +865,7 @@
 	if (config.separate_kernel_samples)
 		args.push_back("--separate=kernel");
 
-	if (do_exec_command(BINDIR "/opcontrol", args))
+	if (do_exec_command(OP_INSTALL_PATH "/bin/opcontrol", args))
 		goto out;
 
 	// now actually start
@@ -872,7 +873,7 @@
 	args.push_back("--start");
 	if (config.verbose)
 		args.push_back("--verbose");
-	do_exec_command(BINDIR "/opcontrol", args);
+	do_exec_command(OP_INSTALL_PATH "/bin/opcontrol", args);
 
 out:
 	total_nr_interrupts = 0;
@@ -886,7 +887,7 @@
 	args.push_back("--shutdown");
 
 	if (daemon_status().running)
-		do_exec_command(BINDIR "/opcontrol", args);
+		do_exec_command(OP_INSTALL_PATH "/bin/opcontrol", args);
 	else
 		QMessageBox::warning(this, 0, "The profiler is already stopped.");