Merge remote-tracking branch 'mfischer/expat' into next

This commit is contained in:
Michael Tremer
2015-03-16 17:53:50 +01:00
2 changed files with 13 additions and 12 deletions

View File

@@ -5,10 +5,11 @@
#usr/lib/libexpat.la
usr/lib/libexpat.so
usr/lib/libexpat.so.1
usr/lib/libexpat.so.1.5.0
#usr/man/man1/xmlwf.1
#usr/share/doc/expat-2.0.0
#usr/share/doc/expat-2.0.0/expat.png
#usr/share/doc/expat-2.0.0/reference.html
#usr/share/doc/expat-2.0.0/style.css
#usr/share/doc/expat-2.0.0/valid-xhtml10.png
usr/lib/libexpat.so.1.6.0
#usr/lib/pkgconfig/expat.pc
#usr/share/doc/expat-2.1.0
#usr/share/doc/expat-2.1.0/expat.png
#usr/share/doc/expat-2.1.0/reference.html
#usr/share/doc/expat-2.1.0/style.css
#usr/share/doc/expat-2.1.0/valid-xhtml10.png
#usr/share/man/man1/xmlwf.1

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 2.0.0
VER = 2.1.0
THISAPP = expat-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = d945df7f1c0868c5c73cf66ba9596f3f
$(DL_FILE)_MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
install : $(TARGET)
@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/expat-2.0.0
cd $(DIR_APP) && install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-2.0.0
cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/expat-2.1.0
cd $(DIR_APP) && install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-2.1.0
@rm -rf $(DIR_APP)
@$(POSTBUILD)