[CMAKE/RPM]: Fix build for x86-64

RPMS for FC6 x86-64 are available at:

http://oops.ghostprotocols.net:81/acme/dwarves/rpm/x86-64/

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

CMakeLists.txt

@@ -1,5 +1,18 @@
 project(pahole)
 
+# Try to parse this later, Helio just showed me a KDE4 example to support
+# x86-64 builds.
+# the following are directories where stuff will be installed to
+set(__LIB "" CACHE STRING "Define suffix of directory name (32/64)" )
+
+macro(_SET_FANCY _var _value _comment)
+	if (NOT DEFINED ${_var})
+		set(${_var} ${_value})
+	else (NOT DEFINED ${_var})
+		set(${_var} "${${_var}}" CACHE PATH "${_comment}")
+	endif (NOT DEFINED ${_var})
+endmacro(_SET_FANCY)
+
 # where to look first for cmake modules,
 # before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
@@ -8,6 +21,8 @@ SET(CMAKE_BUILD_TYPE debug)
 
 find_package(DWARF REQUIRED)
 
+_SET_FANCY(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/usr/${__LIB}" "libdir")
+
 SET(dwarves_LIB_SRCS dwarves.c)
 ADD_LIBRARY(dwarves SHARED ${dwarves_LIB_SRCS})
 SET_TARGET_PROPERTIES(dwarves PROPERTIES VERSION 1.0.0 SOVERSION 1)
@@ -41,6 +56,6 @@ ADD_EXECUTABLE(prefcnt ${prefcnt_SRCS})
 TARGET_LINK_LIBRARIES(prefcnt dwarves ${DWARF_LIBRARIES})
 
 INSTALL(TARGETS codiff ctracer dtagnames pahole pdwtags pfunct prefcnt RUNTIME DESTINATION /usr/bin)
-INSTALL(TARGETS dwarves LIBRARY DESTINATION /usr/lib)
+INSTALL(TARGETS dwarves LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(FILES dwarves.h DESTINATION /usr/include)
-INSTALL(FILES lib/Makefile lib/ctracer_jprobe.c DESTINATION /usr/lib/ctracer)
+INSTALL(FILES lib/Makefile lib/ctracer_jprobe.c DESTINATION ${LIB_INSTALL_DIR}/ctracer)

rpm/SPECS/dwarves.spec

@@ -3,7 +3,7 @@
 
 Name: dwarves
 Version: 0
-Release: 11
+Release: 12
 License: GPL
 Summary: Dwarf Tools
 Group: Base
@@ -15,7 +15,7 @@ BuildRequires: elfutils-devel
 BuildRequires: gcc
 BuildRequires: glibc-devel
 BuildRequires: make
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-acme
 
 %description
 dwarves is a set of tools that use the DWARF debugging information inserted in
@@ -48,7 +48,7 @@ DWARF processing library development files
 %setup -q -c -n %{name}-%{version}
 
 %build
-cmake .
+cmake -D __LIB=%{_lib} .
 make
 
 %install
@@ -85,6 +85,10 @@ rm -rf %{buildroot}
 %{_libdir}/%{libname}.so
 
 %changelog
+* Tue Jan 30 2007 Arnaldo Carvalho de Melo <acme@redhat.com>
+- 8e236f4ca37b8a3d2057f4ede5a14ab1fa99f73c
+- x86-64 lib install fixes
+
 * Tue Jan 30 2007 Arnaldo Carvalho de Melo <acme@redhat.com>
 - 4a4b75e75a6d7f34215d320cc4a9f669b6ba4075
 - pahole --reorganize