Hinzugefügt:

[ipfire-2.x.git] / lfs / pwlib

diff --git a/lfs/pwlib b/lfs/pwlib
index f5d1caba1a76e50f25b3e874451ed4d57980ddea..6390266d5c234bf1259cef4c31cff98960190f07 100644 (file)
--- a/lfs/pwlib
+++ b/lfs/pwlib
@@ -18,11 +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: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +27,11 @@
 
 include Config
 
-VER        = 1.5.2
+VER        = ipfire1
 
-THISAPP    = pwlib_$(VER)
+THISAPP    = pwlib-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openh323.org/bin
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/pwlib
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0fa33ba1b32b254abe0b731a52c0f2f9
+$(DL_FILE)_MD5 = 2e2eecdc3ba54bdc973892ef9eea45c8
 
 install : $(TARGET)
 
@@ -58,6 +53,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+       make-packages.sh pwlib $(THISAPP)-ipfire-beta-1
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -77,9 +75,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       mv /usr/include/ldap.h /
+       rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(DL_FILE)
+       if [ -f /usr/include/ldap.h ]; then mv -f /usr/include/ldap.h / ; fi
        cd $(DIR_APP) && ./configure --prefix=/usr
+       if [ -f /ldap.h ]; then mv -f /ldap.h /usr/include/ ; fi
        cd $(DIR_APP) && make opt && make install
-       mv /ldap.h /usr/include
        @$(POSTBUILD)