From 0d2001936feb50a6a23beae76f783af0abf02675 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 10 Mar 2008 07:52:03 +0000 Subject: - do not install monitor-get-edid-using-vbe on archs where VBE is not available (Remi Collet) --- Makefile | 10 ++++++++-- NEWS | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a7f56ed..f66d896 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,10 @@ DESTDIR= bindir=/usr/bin sbindir=/usr/sbin -TARGETS = monitor-get-edid-using-vbe cvt +TARGETS = cvt +ifdef HAS_VBE +TARGETS += monitor-get-edid-using-vbe +endif CPPFLAGS = -I. CFLAGS = -O -Wall -g @@ -45,7 +48,10 @@ libint10.a: int10/*.c install: install -d $(DESTDIR)$(bindir) install -d $(DESTDIR)$(sbindir) - install monitor-edid monitor-get-edid-using-vbe monitor-probe monitor-probe-using-X $(DESTDIR)$(sbindir) + install monitor-edid monitor-probe monitor-probe-using-X $(DESTDIR)$(sbindir) +ifdef HAS_VBE + install monitor-get-edid-using-vbe $(DESTDIR)$(sbindir) +endif install monitor-parse-edid $(DESTDIR)$(bindir) install cvt $(DESTDIR)$(bindir)/vesa-cvt ln -s monitor-edid $(DESTDIR)$(sbindir)/monitor-get-edid diff --git a/NEWS b/NEWS index 4dbbaf6..bd170db 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +- do not install monitor-get-edid-using-vbe on archs where VBE is not + available (Remi Collet) + Version 1.15 - 23 January 2008 - monitor-probe: -- cgit v1.2.1