aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-10 07:52:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-10 07:52:03 +0000
commit0d2001936feb50a6a23beae76f783af0abf02675 (patch)
tree1543166ee1af22af7b655b92c947c2be03c97c31
parenta6286fcbbb2c569745c756fbdc29486b89af8bb0 (diff)
downloadmonitor-edid-0d2001936feb50a6a23beae76f783af0abf02675.tar
monitor-edid-0d2001936feb50a6a23beae76f783af0abf02675.tar.gz
monitor-edid-0d2001936feb50a6a23beae76f783af0abf02675.tar.bz2
monitor-edid-0d2001936feb50a6a23beae76f783af0abf02675.tar.xz
monitor-edid-0d2001936feb50a6a23beae76f783af0abf02675.zip
- do not install monitor-get-edid-using-vbe on archs where VBE is not
available (Remi Collet)
-rw-r--r--Makefile10
-rw-r--r--NEWS3
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: