Merge remote-tracking branch 'origin/next'

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

diff --git a/lfs/stage2 b/lfs/stage2
index 0a5ac65c09a3f641d2f549751b8b8b07220bc61b..4ab5edd8b59909e849d7446f992e0714800e93b2 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -71,11 +71,11 @@ endif
 
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
-       -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
-       -ln -sv /tools/bin/perl /usr/bin
-       -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-       -ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib
-       sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
+       -ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin
+       -ln -sv $(TOOLS_DIR)/bin/perl /usr/bin
+       -ln -sv $(TOOLS_DIR)/lib/libgcc_s.so{,.1} /usr/lib
+       -ln -sv $(TOOLS_DIR)/lib/libstdc++.so{,.6} /usr/lib
+       sed 's@$(TOOLS_DIR)@/usr@' $(TOOLS_DIR)/lib/libstdc++.la > /usr/lib/libstdc++.la
        -ln -sv bash /bin/sh
 
        # Config files