Zwischencommit fuer LFS.

[people/pmueller/ipfire-2.x.git] / lfs / GD

diff --git a/lfs/GD b/lfs/GD
index 519ae5e7c6935dd056fb3f84026725a124cf99f0..392f704b3aca5995ed2fcc24be6d240a93443554 100644 (file)
--- a/lfs/GD
+++ b/lfs/GD
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: gd,v 1.5.2.4 2005/03/04 19:26:50 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 2.0.20
+VER        = 2.35
 
-THISAPP    = gd-$(VER)
+THISAPP    = GD-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.boutell.com/gd/http
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3e513bf438a8d797b508a4fbf52c9bd1
+$(DL_FILE)_MD5 = dfc3e16e85a17aab7ee1029fbe307fca
 
 install : $(TARGET)
 
@@ -78,11 +72,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP) && sed -i \
-           -e 's%^#include "jpeglib.h".*$$%%' \
-           -e 's%^#include "jerror.h".*$$%%' gd_jpeg.c
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && sed -i "s%,'y'%,'n'%" Makefile.PL
+       cd $(DIR_APP) && yes 'n' | perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)