From cb3fbcd551017645b092743e2b48c27514829196 Mon Sep 17 00:00:00 2001
From: Remy Bohmer <linux@bohmer.net>
Date: Sun, 20 Jun 2010 22:48:09 +0200
Subject: [PATCH 1/2] fix cross-compilation

Signed-off-by: Remy Bohmer <linux@bohmer.net>
[mkl: improve fix]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 src/Makefile      |    4 ++--
 src/core/Makefile |    6 +++---
 src/gui/Makefile  |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 93c3ead..ea20184 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,8 +18,8 @@ export DATADIR
 CXX?=c++
 INCLUDES=-I./core/
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-LDFLAGS=-L./core/ -g
+CXXFLAGS+=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
+LDFLAGS+=-L./core/ -g
 ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 	LDFLAGS+= -Wl,--as-needed
 endif
diff --git a/src/core/Makefile b/src/core/Makefile
index 024b921..b108a6e 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -1,10 +1,10 @@
 PACKAGENAME?=lshw
 
-CXX=c++
+CXX?=c++
 INCLUDES=
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-LDFLAGS=
+CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
+LDFLAGS+=
 LDSTATIC=
 LIBS=
 
diff --git a/src/gui/Makefile b/src/gui/Makefile
index 05fbbfd..d410a1d 100644
--- a/src/gui/Makefile
+++ b/src/gui/Makefile
@@ -8,11 +8,11 @@ OBJCOPY?=objcopy
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
 GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
 INCLUDES=-I../core $(GTKINCLUDES)
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-CFLAGS=$(CXXFLAGS) $(DEFINES)
+CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
+CFLAGS+=$(CXXFLAGS) $(DEFINES)
 GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
 LIBS=-L../core -llshw -lresolv $(GTKLIBS)
-LDFLAGS=
+LDFLAGS+=
 ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 	LDFLAGS+= -Wl,--as-needed
 endif
-- 
1.7.1