diff -u -r fbv-0.99/Make.conf fbv-0.99-drg/Make.conf
--- fbv-0.99/Make.conf	2003-08-24 22:29:22.000000000 +0200
+++ fbv-0.99-drg/Make.conf	2003-12-05 22:34:25.000000000 +0100
@@ -1,2 +1,6 @@
-error:
-	@echo Please run ./configure first...
+prefix	= /usr/local
+bindir	= /usr/local/bin
+mandir	= /usr/local/man
+infodir	= /usr/local/info
+
+LIBS	= -ljpeg 
diff -u -r fbv-0.99/Makefile fbv-0.99-drg/Makefile
--- fbv-0.99/Makefile	2003-08-24 22:29:12.000000000 +0200
+++ fbv-0.99-drg/Makefile	2003-12-05 22:34:01.000000000 +0100
@@ -3,8 +3,6 @@
 #
 # Makefile for fbv
 
-include Make.conf
-
 CC	= gcc -O2 -Wall
 
 SOURCES	= main.c jpeg.c gif.c png.c bmp.c fb_display.c resize.c
@@ -13,6 +11,8 @@
 OUT	= fbv
 LIBS	= -lungif -lX11 -L/usr/X11R6/lib -ljpeg -lpng
 
+include Make.conf
+
 all: $(OUT)
 	@echo Build DONE.
 
diff -u -r fbv-0.99/configure fbv-0.99-drg/configure
--- fbv-0.99/configure	2002-01-14 22:20:11.000000000 +0100
+++ fbv-0.99-drg/configure	2003-12-05 22:32:46.000000000 +0100
@@ -69,10 +69,10 @@
 		--bindir) bindir="$2" ; shift 2 ;;
 		--infodir) infodir="$2" ; shift 2 ;;
 		--mandir) mandir="$2" ; shift 2 ;;
-		--without-libungif) ungif="disabled" ; shift ;;
-		--without-libjpeg) jpeg="disabled" ; shift ;;
-		--without-libpng) png="disabled" ; shift ;;
-		--without-bmp) bmp="disabled" ; shift ;;
+		--without-libungif) ungif="no" ; shift ;;
+		--without-libjpeg) jpeg="no" ; shift ;;
+		--without-libpng) png="no" ; shift ;;
+		--without-bmp) bmp="no" ; shift ;;
 
 		--) shift ; break ;;
 		*) help ; exit 1 ;;
@@ -100,7 +100,7 @@
 EOF
 ###
 echo -n "checking for libungif presence... "
-if [ "$ungif" != "disabled" ]; then
+if [ "$ungif" != "no" ]; then
 xdir="/usr/X11R6"
 ungif="no"
 echo "libungif check" >>./config.log
@@ -121,7 +121,7 @@
 echo "libungif: $ungif" >> ./config.log
 ###
 echo -n "checking for libjpeg presence... "
-if [ "$jpeg" != "disabled" ]; then
+if [ "$jpeg" != "no" ]; then
 jpeg="no"
 cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg
 if [ -e \$\$~test ]; then
@@ -132,7 +132,7 @@
 echo "libjpeg: $jpeg" >> ./config.log
 ###
 echo -n "checking for libpng presence... "
-if [ "$png" != "disabled" ]; then
+if [ "$png" != "no" ]; then
 png="no"
 cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng
 if [ -e \$\$~test ]; then
@@ -143,7 +143,7 @@
 echo "libpng: $png" >> ./config.log
 ###
 echo -n "building with bmp support... "
-if [ "$bmp" != "disabled" ]; then
+if [ "$bmp" != "no" ]; then
 bmp="yes"
 fi
 echo $bmp
@@ -164,10 +164,10 @@
 echo "LIBS	= $libs" | tee -a ./config.log >>Make.conf
 echo "#define IDSTRING \"fbv "`cat VERSION`", s-tech\"" | tee -a ./config.log >config.h
 echo "#define DEFAULT_FRAMEBUFFER \"$dfb\"" | tee -a ./config.log >>config.h
-[ "$ungif" != "disabled" ] && echo "#define FBV_SUPPORT_GIF" | tee -a ./config.log >>config.h
-[ "$jpeg" != "disabled" ] && echo "#define FBV_SUPPORT_JPEG" | tee -a ./config.log >>config.h
-[ "$png" != "disabled" ] && echo "#define FBV_SUPPORT_PNG" | tee -a ./config.log >>config.h
-[ "$bmp" != "disabled" ] && echo "#define FBV_SUPPORT_BMP" | tee -a ./config.log >>config.h
+[ "$ungif" != "no" ] && echo "#define FBV_SUPPORT_GIF" | tee -a ./config.log >>config.h
+[ "$jpeg" != "no" ] && echo "#define FBV_SUPPORT_JPEG" | tee -a ./config.log >>config.h
+[ "$png" != "no" ] && echo "#define FBV_SUPPORT_PNG" | tee -a ./config.log >>config.h
+[ "$bmp" != "no" ] && echo "#define FBV_SUPPORT_BMP" | tee -a ./config.log >>config.h
 echo "installation dir: $bindir"
 echo "manuals dir: $mandir"
 

