Index: svgalib-1.4.3/Makefile.cfg =================================================================== --- svgalib-1.4.3.orig/Makefile.cfg 2011-01-06 13:52:51.000000000 +0100 +++ svgalib-1.4.3/Makefile.cfg 2011-01-06 13:53:01.000000000 +0100 @@ -24,8 +24,8 @@ # Common prefix for installation directories. # NOTE: This directory must exist when you start the install. -TOPDIR= -prefix = $(TOPDIR)/usr/local +TOPDIR=$(DESTDIR) +prefix = $(TOPDIR)/usr exec_prefix = $(prefix) # Directory where the shared stubs and static library will be installed. @@ -52,7 +52,7 @@ #uncomment this if your compiler fails on compiling the assembler in #src/vgaconvplanar.c, gl/inlstring.h, gl/line.c or gl/scale.c -# NO_ASM = y +NO_ASM = y # Uncomment this if you want root processes to be able to always get a new # VC. Alas, some games misuse suid root privs and become root, svgalib cannot @@ -123,98 +123,98 @@ # # Comment out any driver that you don't want included in the library. # -INCLUDE_ET4000_DRIVER = y -INCLUDE_CIRRUS_DRIVER = y -INCLUDE_TVGA_DRIVER = y +# INCLUDE_ET4000_DRIVER = y +# INCLUDE_CIRRUS_DRIVER = y +# INCLUDE_TVGA_DRIVER = y #INCLUDE_OAK_DRIVER = y #INCLUDE_EGA_DRIVER = y -INCLUDE_MACH32_DRIVER = y -INCLUDE_S3_DRIVER = y +# INCLUDE_MACH32_DRIVER = y +# INCLUDE_S3_DRIVER = y #INCLUDE_ET3000_DRIVER = y #INCLUDE_GVGA6400_DRIVER = y #INCLUDE_ARK_DRIVER = y #INCLUDE_ATI_DRIVER = y #INCLUDE_ALI_DRIVER = y -INCLUDE_CHIPS_DRIVER = y -INCLUDE_APM_DRIVER = y -INCLUDE_NV3_DRIVER = y -INCLUDE_ET6000_DRIVER = y -INCLUDE_VESA_DRIVER = y -INCLUDE_MX_DRIVER = y -INCLUDE_PARADISE_DRIVER = y -INCLUDE_RAGE_DRIVER = y -INCLUDE_BANSHEE_DRIVER = y -INCLUDE_SIS_DRIVER = y -INCLUDE_I740_DRIVER = y -INCLUDE_LAGUNA_DRIVER = y -INCLUDE_NEO_DRIVER = y -INCLUDE_R128_DRIVER = y -INCLUDE_G400_DRIVER = y +# INCLUDE_CHIPS_DRIVER = y +# INCLUDE_APM_DRIVER = y +# INCLUDE_NV3_DRIVER = y +# INCLUDE_ET6000_DRIVER = y +# INCLUDE_VESA_DRIVER = y +# INCLUDE_MX_DRIVER = y +# INCLUDE_PARADISE_DRIVER = y +# INCLUDE_RAGE_DRIVER = y +# INCLUDE_BANSHEE_DRIVER = y +# INCLUDE_SIS_DRIVER = y +# INCLUDE_I740_DRIVER = y +# INCLUDE_LAGUNA_DRIVER = y +# INCLUDE_NEO_DRIVER = y +# INCLUDE_R128_DRIVER = y +# INCLUDE_G400_DRIVER = y INCLUDE_FBDEV_DRIVER = y -INCLUDE_SAVAGE_DRIVER = y +# INCLUDE_SAVAGE_DRIVER = y # # Comment out any adapter you don't want to autodetect. # -INCLUDE_ET4000_DRIVER_TEST = y -INCLUDE_CIRRUS_DRIVER_TEST = y -INCLUDE_TVGA_DRIVER_TEST = y +# INCLUDE_ET4000_DRIVER_TEST = y +# INCLUDE_CIRRUS_DRIVER_TEST = y +# INCLUDE_TVGA_DRIVER_TEST = y #INCLUDE_OAK_DRIVER_TEST = y #INCLUDE_EGA_DRIVER_TEST = y -INCLUDE_MACH32_DRIVER_TEST = y +# INCLUDE_MACH32_DRIVER_TEST = y #INCLUDE_GVGA6400_DRIVER_TEST = y -INCLUDE_S3_DRIVER_TEST = y +# INCLUDE_S3_DRIVER_TEST = y #INCLUDE_ET3000_DRIVER_TEST = y #INCLUDE_ARK_DRIVER_TEST = y #INCLUDE_ATI_DRIVER_TEST = y #INCLUDE_ALI_DRIVER_TEST = y -INCLUDE_CHIPS_DRIVER_TEST = y -INCLUDE_APM_DRIVER_TEST = y -INCLUDE_NV3_DRIVER_TEST = y -INCLUDE_ET6000_DRIVER_TEST = y -INCLUDE_MX_DRIVER_TEST = y -INCLUDE_PARADISE_DRIVER_TEST = y -INCLUDE_RAGE_DRIVER_TEST = y -INCLUDE_BANSHEE_DRIVER_TEST = y -INCLUDE_SIS_DRIVER_TEST = y -INCLUDE_I740_DRIVER_TEST = y -INCLUDE_LAGUNA_DRIVER_TEST = y -INCLUDE_NEO_DRIVER_TEST = y -INCLUDE_G400_DRIVER_TEST = y -INCLUDE_R128_DRIVER_TEST = y -#INCLUDE_FBDEV_DRIVER_TEST = y -INCLUDE_SAVAGE_DRIVER_TEST = y +# INCLUDE_CHIPS_DRIVER_TEST = y +# INCLUDE_APM_DRIVER_TEST = y +# INCLUDE_NV3_DRIVER_TEST = y +# INCLUDE_ET6000_DRIVER_TEST = y +# INCLUDE_MX_DRIVER_TEST = y +# INCLUDE_PARADISE_DRIVER_TEST = y +# INCLUDE_RAGE_DRIVER_TEST = y +# INCLUDE_BANSHEE_DRIVER_TEST = y +# INCLUDE_SIS_DRIVER_TEST = y +# INCLUDE_I740_DRIVER_TEST = y +# INCLUDE_LAGUNA_DRIVER_TEST = y +# INCLUDE_NEO_DRIVER_TEST = y +# INCLUDE_G400_DRIVER_TEST = y +# INCLUDE_R128_DRIVER_TEST = y +INCLUDE_FBDEV_DRIVER_TEST = y +# INCLUDE_SAVAGE_DRIVER_TEST = y #Might be too dangerous: -INCLUDE_VESA_DRIVER_TEST = y +# INCLUDE_VESA_DRIVER_TEST = y # # Comment out any dac support that you don't want included in the library. # # you must include SIERRA_DAC, if you include any of SCxxxx DACs. -INCLUDE_NORMAL_DAC = y -INCLUDE_S3_SDAC_DAC = y -INCLUDE_S3_GENDAC_DAC = y -INCLUDE_S3_TRIO64_DAC = y -INCLUDE_SIERRA_DAC = y -INCLUDE_SC15025_DAC = y -INCLUDE_ATT20C490_DAC = y -INCLUDE_ATT20C498_DAC = y -INCLUDE_ICW_DAC = y -INCLUDE_IBMRGB52x_DAC = y -INCLUDE_SC1148X_DAC = y +# INCLUDE_NORMAL_DAC = y +# INCLUDE_S3_SDAC_DAC = y +# INCLUDE_S3_GENDAC_DAC = y +# INCLUDE_S3_TRIO64_DAC = y +# INCLUDE_SIERRA_DAC = y +# INCLUDE_SC15025_DAC = y +# INCLUDE_ATT20C490_DAC = y +# INCLUDE_ATT20C498_DAC = y +# INCLUDE_ICW_DAC = y +# INCLUDE_IBMRGB52x_DAC = y +# INCLUDE_SC1148X_DAC = y # # Comment out any dac you don't want to autodetect. # (not all dacs can be autodetected, at this time) # -INCLUDE_S3_SDAC_DAC_TEST = y -INCLUDE_S3_GENDAC_DAC_TEST = y -INCLUDE_SC15025_DAC_TEST = y -INCLUDE_ATT20C490_DAC_TEST = y -INCLUDE_IBMRGB52x_DAC_TEST = y -INCLUDE_SC1148X_DAC_TEST = y - +# INCLUDE_S3_SDAC_DAC_TEST = y +# INCLUDE_S3_GENDAC_DAC_TEST = y +# INCLUDE_SC15025_DAC_TEST = y +# INCLUDE_ATT20C490_DAC_TEST = y +# INCLUDE_IBMRGB52x_DAC_TEST = y +# INCLUDE_SC1148X_DAC_TEST = y +# # Location of the svgalib configuration file. SVGALIB_CONFIG_FILE = $(datadir)/libvga.config @@ -226,7 +226,7 @@ # If you just want to use the et4000.regs in the source directory, # comment out the definition of DYNAMIC. DYNAMIC allows development of new # resolutions without recompiling. -DYNAMIC = y +# DYNAMIC = y ET4000_REGS = $(datadir)/libvga.et4000 # The EGA driver may load additional modes (SuperEGA cards) like the @@ -270,9 +270,9 @@ CFLAGS = $(WARN) $(DLLFLAGS) $(INCLUDES) $(OPTIMIZE) $(DEFINES) # ELF doesn't like -N. It is beneficial for small tools with a.out ifeq (a.out, $(TARGET_FORMAT)) - LDFLAGS = -N -s +# LDFLAGS = -N -s else - LDFLAGS = -s +# LDFLAGS = -s endif # Uncomment the following if you are compiling a.out shared libraries @@ -289,6 +289,6 @@ # Utilites used. AR = ar -INSTALL_PROGRAM = install -c -s -m 755 -o root -g bin -INSTALL_SHLIB = install -c -m 755 -o root -g bin -INSTALL_DATA = install -c -m 644 -o root -g bin +INSTALL_PROGRAM = install -c -s -m 755 +INSTALL_SHLIB = install -c -m 755 +INSTALL_DATA = install -c -m 644