Source: wordwarvi
Version: 1.00+dfsg1-4
Tags: patch upstream
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

wordwarvi fails to cross build from source, because the upstream
Makefile hard codes the build architecture pkg-config. Please consider
applying the attached patch to make it substitutable.

Helmut
--- wordwarvi-1.00+dfsg1.orig/Makefile
+++ wordwarvi-1.00+dfsg1/Makefile
@@ -2,6 +2,7 @@
 DATADIR=${PREFIX}/share/wordwarvi
 MANDIR?=${PREFIX}/share/man
 MANPAGEDIR=${MANDIR}/man6
+PKG_CONFIG?=pkg-config
 
 SCREENSAVERFLAG=
 #SCREENSAVERFLAG=-DDO_INHIBIT_SCREENSAVER
@@ -12,8 +13,8 @@
 # WITHAUDIO=no
 
 ifeq (${WITHAUDIO},yes)
-SNDLIBS=`pkg-config --libs portaudio-2.0 vorbisfile`
-SNDFLAGS=-DWITHAUDIOSUPPORT `pkg-config --cflags portaudio-2.0`
+SNDLIBS=`$(PKG_CONFIG) --libs portaudio-2.0 vorbisfile`
+SNDFLAGS=-DWITHAUDIOSUPPORT `$(PKG_CONFIG) --cflags portaudio-2.0`
 OGGOBJ=ogg_to_pcm.o
 else
 SNDLIBS=
@@ -44,13 +45,13 @@
 
 HAS_PORTAUDIO_2_0:
 ifeq (${WITHAUDIO},yes)
-	pkg-config --print-errors --exists portaudio-2.0
+	$(PKG_CONFIG) --print-errors --exists portaudio-2.0
 else
 endif
 
 HAS_VORBISFILE:
 ifeq (${WITHAUDIO},yes)
-	pkg-config --print-errors --exists vorbisfile
+	$(PKG_CONFIG) --print-errors --exists vorbisfile
 else
 endif
 
@@ -58,17 +59,17 @@
 	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c joystick.c
 
 ogg_to_pcm.o:	ogg_to_pcm.c ogg_to_pcm.h Makefile
-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
+	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `$(PKG_CONFIG) --cflags vorbisfile` \
 		-pthread -Wall -c ogg_to_pcm.c
 
 wwviaudio.o:	wwviaudio.c wwviaudio.h ogg_to_pcm.h my_point.h Makefile
 	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} \
 		${DEFINES} \
-		-pthread `pkg-config --cflags vorbisfile` \
+		-pthread `$(PKG_CONFIG) --cflags vorbisfile` \
 		-c wwviaudio.c
 
 rumble.o:	rumble.c rumble.h Makefile
-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
+	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `$(PKG_CONFIG) --cflags vorbisfile` \
 		-pthread -Wall -c rumble.c
 
 wwvi_font.o:	wwvi_font.c wwvi_font.h my_point.h Makefile
@@ -87,7 +88,7 @@
 		${OGGOBJ} \
 		wwviaudio.o \
 		wordwarvi.c -o wordwarvi -lm ${SNDLIBS} \
-		`pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0 gthread-2.0`
+		`$(PKG_CONFIG) --cflags gtk+-2.0` `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
 	/bin/rm stamp.h
 
 wordwarvi.6.gz:	wordwarvi.6

Reply via email to