zlib-ng: Install the compat library into /lib again

This is just to remain compatible with the older version which was also
installed in /lib.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng
index 0e6cf18c53b84164a2fcc69c3b89540836a21244..be111d2445d4cfc9eae8c18ecef3f1c8c1c18851 100644 (file)
--- a/config/rootfiles/common/zlib-ng
+++ b/config/rootfiles/common/zlib-ng
@@ -1,3 +1,6 @@
+#lib/libz.so
+lib/libz.so.1
+lib/libz.so.1.3.1.zlib-ng
 #usr/include/zconf-ng.h
 #usr/include/zconf.h
 #usr/include/zlib-ng.h
@@ -9,9 +12,6 @@
 usr/lib/libz-ng.so.2
 usr/lib/libz-ng.so.2.2.3
 #usr/lib/libz.a
-#usr/lib/libz.so
-usr/lib/libz.so.1
-usr/lib/libz.so.1.3.1.zlib-ng
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/zlib-ng.pc
 #usr/lib/pkgconfig/zlib.pc

diff --git a/lfs/zlib-ng b/lfs/zlib-ng
index 5310c60517dac45e36e0ade3115a636d7a437496..7708d3c760902cace9ceb8eca7e8c13fdfa7e95e 100644 (file)
--- a/lfs/zlib-ng
+++ b/lfs/zlib-ng
@@ -94,5 +94,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/build  && make install
        cd $(DIR_APP)/compat && make install
 
+ifneq "$(TOOLCHAIN)" "1"
+       mv -v /usr/lib/libz.so.1.3.1.zlib-ng /lib/libz.so.1.3.1.zlib-ng
+       ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so.1
+       ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so
+       rm -vf /usr/lib/libz.so.1
+       rm -vf /usr/lib/libz.so
+endif
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)