X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fpwlib;h=6390266d5c234bf1259cef4c31cff98960190f07;hb=589124f08f5a07f93c7231c21e7f5bf2bafb7e17;hp=836ebebf3332e692bbdc9e7472b59a5d31692042;hpb=180cd3beb8c8ec84520002aaf3c55e748dd89f9b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/pwlib b/lfs/pwlib
index 836ebebf33..6390266d5c 100644
--- a/lfs/pwlib
+++ b/lfs/pwlib
@@ -27,11 +27,11 @@
 
 include Config
 
-VER        = Mimas_patch2-src-tar
+VER        = ipfire1
 
 THISAPP    = pwlib-$(VER)
-DL_FILE    = $(THISAPP).gz
-DL_FROM    = $(URL_SFNET)/openh323
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/pwlib
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 90edee9d894558f98f840c1972205218
+$(DL_FILE)_MD5 = 2e2eecdc3ba54bdc973892ef9eea45c8
 
 install : $(TARGET)
 
@@ -53,6 +53,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+	make-packages.sh pwlib $(THISAPP)-ipfire-beta-1
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -72,11 +75,9 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
-	ln -sf -v $(DIR_SRC)/pwlib* $(DIR_APP)
-#	mv -f $(DIR_SRC)/pwlib* $(DIR_SRC)/pwlib
-#	mv -f /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
-#	mv -f /ldap.h /usr/include	
+	if [ -f /ldap.h ]; then mv -f /ldap.h /usr/include/ ; fi
 	cd $(DIR_APP) && make opt && make install
 	@$(POSTBUILD)