summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-10-14 18:42:28 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-10-14 18:42:28 (GMT)
commitd785694f5a978a8ed93a40e847b7f069e6add913 (patch)
treeb46f255dbe4659f8a35ae702f6d22d48edddcec9
parentc4e6bc74de5ac03e74b797bbcd088977f166d484 (diff)
downloadbuildroot-d785694f5a978a8ed93a40e847b7f069e6add913.tar.gz
buildroot-d785694f5a978a8ed93a40e847b7f069e6add913.tar.bz2
torsmo: fix build when help2man is available on host
help2man doesn't work when cross compiling, as it wants to run ./program --help, so ensure torsmo doesn't try to use it. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/torsmo/torsmo.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3cf4a0f..7edbda8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -42,7 +42,7 @@
pkg-config, prboom, radvd, rdesktop, ruby, qt, quagga, samba,
sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,
speex, sqlite, squashfs, strace, sylpheed, taglib, tcpdump,
- thttpd, tiff, tn5250, udev, udpcast, usbmount, usbutils,
+ thttpd, tiff, tn5250, torsmo, udev, udpcast, usbmount, usbutils,
vsftpd, vtun, which, wpa_supplicant, xapp_twm,
xapp_xbacklight,
xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
index 03477d1..a9cbc5d 100644
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -10,6 +10,8 @@ TORSMO_AUTORECONF = NO
TORSMO_INSTALL_STAGING = NO
TORSMO_INSTALL_TARGET = YES
+# help2man doesn't work when cross compiling
+TORSMO_CONF_ENV = HELP2MAN=''
TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x
TORSMO_DEPENDENCIES = xserver_xorg-server