--- Makefile.old Sat Sep 14 12:10:44 2002 +++ Makefile Sat Sep 14 13:07:40 2002 @@ -3,7 +3,7 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc #compiler; get gcc if you are still using it). -COMPILER=gcc +COMPILER=cc #If the ar command fails on your system, consult the ar manpage #for your system. @@ -30,13 +30,13 @@ #Some systems are very picky about link order. They don't all agree #on the right order, either. -LIBS=-lgd -lpng -lz -lm +LIBS=-lgd -lpng -ljpeg -lz #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a #variation of this and comment out the line above. Note that #Xpm requires X11. See also CFLAGS above. -#LIBS=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf +LIBS=-lgd -lpng -lz -ljpeg #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead. @@ -45,26 +45,26 @@ #ensure that the version of gd you are installing is used, and not an #older release in your directory tree somewhere. -INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include +INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I$(PREFIX)/include #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -#such as /lib or /usr/lib, then change this. Be sure to keep +#such as or /usr/lib, then change this. Be sure to keep #-L. as this allows the gd library itself to be found. #Put -L. first so that old versions of the gd library elsewhere #on your system can't cause conflicts while building a new one. #This line shouldn't hurt if you don't actually have some of the #optional libraries and directories. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=-L. -L$(PREFIX)/lib -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib +INSTALL_LIB=$(PREFIX)/lib #Location where .h files should be installed by "make install". -INSTALL_INCLUDE=/usr/local/include +INSTALL_INCLUDE=$(PREFIX)/include #Location where useful non-test programs should be installed by "make install". -INSTALL_BIN=/usr/local/bin +INSTALL_BIN=$(PREFIX)/bin # #