Remove the now obsolete install_filename from FileTarget

diff --git a/source/lib/filetarget.h b/source/lib/filetarget.h
index da165d0d39d1ebed128c83c0d31ce4f2a184139c..d2ed71954010be4e8824ceba73e9665dab8d583c 100644 (file)
--- a/source/lib/filetarget.h
+++ b/source/lib/filetarget.h
@@ -15,7 +15,6 @@ protected:
        Msp::Time::TimeStamp mtime;
        unsigned size = 0;
        Msp::FS::Path install_location;
-       std::string install_filename;
        bool nested_build_sig = false;
        bool arch_in_build_sig = false;
 
@@ -33,7 +32,6 @@ public:
 
        bool is_installable() const { return !install_location.empty(); }
        const Msp::FS::Path &get_install_location() const { return install_location; }
-       const std::string &get_install_filename() const { return install_filename; }
 
        /// Changes the mtime of the target to the current time.
        void touch();

diff --git a/source/lib/installedfile.cpp b/source/lib/installedfile.cpp
index 6e45ad27efc66ac65d8e9643b1763c75a4811a17..ef7a7709e6335ba2f2682c5af6b71ed7e4524101 100644 (file)
--- a/source/lib/installedfile.cpp
+++ b/source/lib/installedfile.cpp
@@ -42,11 +42,7 @@ FS::Path InstalledFile::generate_target_path(const FS::Path &global_prefix, cons
        if(mid.empty())
                mid = tgt.get_install_location();
 
-       string fn = tgt.get_install_filename();
-       if(fn.empty())
-               fn = FS::basename(tgt.get_path());
-
-       return prefix/mid/fn;
+       return prefix/mid/FS::basename(tgt.get_path());
 }
 
 void InstalledFile::set_symlink(const FS::Path &l)