# 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
# Move script to correct place.
mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
+ mv -vf /usr/local/bin/captive-cleanup /usr/bin/
# Install firewall scripts.
mkdir -pv /usr/lib/firewall