From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 28 Mar 2009 22:14:28 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a9270f90bca85146fa7432d7da3b767759c8ca;p=ipfire-3.x.git

Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:
	lfs/libbdevid
---

b7a9270f90bca85146fa7432d7da3b767759c8ca
diff --cc lfs/libbdevid
index 05d055354,1eb644c28..303da1fae
--- a/lfs/libbdevid
+++ b/lfs/libbdevid
@@@ -74,7 -76,6 +76,7 @@@ $(objects)
  $(OBJECT): $(objects)
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 +	cd $(DIR_APP) && sed -e "s/^CFLAGS += -Iinclude/CFLAGS = $(CFLAGS) -fpic -Iinclude/g" -i Makefile
- 	cd $(DIR_APP) && export VER=0.1; make install
+ 	cd $(DIR_APP) && make install
  	@rm -rf $(DIR_APP)
  	@$(POSTBUILD)