diff options
| -rwxr-xr-x | build | 25 |
1 files changed, 9 insertions, 16 deletions
@@ -182,16 +182,10 @@ $(installnative_targets): # Remove libquadmath files. rm -f $(gcclibdir)/libquadmath.* # Remove libtool archives. - libdir=/usr/lib/$(target) && \ rm -f \ - $(destdir)$${libdir}/libssp.la \ - $(destdir)$${libdir}/libssp_nonshared.la \ - $(destdir)$${libdir}/gcc-$(base_version)/liblto_plugin.la \ - $(destdir)$${libdir}/libquadmath.la \ - $(destdir)$${libdir}/libgomp.la \ - $(destdir)$${libdir}/libitm.la \ - $(destdir)$${libdir}/libstdc++.la \ - $(destdir)$${libdir}/libsupc++.la + $(gcclibdir)/*.la \ + $(tgtlibdir)/*.la \ + $(tgtlibdir)/plugin/*.la # Remove the info directory node. rm -f $(destdir)/usr/share/info/dir # Remove empty documentation files. @@ -201,10 +195,10 @@ $(installnative_targets): -exec rm -f '{}' ';' # TODO: Provide these files in a fixincludes package (arch:any, # target-specific?). - rm -Rf $(destdir)/usr/lib/$(target)/gcc-$(base_version)/install-tools/ + rm -Rf $(tgtlibdir)/install-tools/ # TODO: Provide these files in a libstdc++-*-dbg package. - rm -f $(destdir)/usr/lib/$(target)/libstdc++.so.*-gdb.py - rm -Rf $(destdir)/usr/share/gcc-*/python/libstdcxx/ + rm -f $(gcclibdir)/libstdc++.so.*-gdb.py + rm -Rf $(destdir)/usr/share/gcc-$(version)/python/libstdcxx/ # TODO: Provide these files in a doc package. rm -Rf $(destdir)/usr/share/man/ $(destdir)/usr/share/info/ # TODO: Provide these files in a gcc-*-plugin-dev package. @@ -237,11 +231,10 @@ $(installcross_targets): # Move files into ProteanOS-style directories. mkdir -p $(tgtlibdir) mv $(libdir)/gcc/$(target_gnu)/$(version)/* $(tgtlibdir) - libdir=/usr/lib/$(target) && \ rm -Rf \ - $(destdir)$${libdir}/gcc-$(base_version)/liblto_plugin.la \ - $(destdir)$${libdir}/gcc-$(base_version)/install-tools \ - $(destdir)$${libdir}/gcc-$(base_version)/plugin \ + $(tgtlibdir)/*.la \ + $(tgtlibdir)/install-tools \ + $(tgtlibdir)/plugin \ $(destdir)/usr/share/locale \ $(destdir)/usr/share/man \ $(destdir)/usr/share/info |