Also use file size to determine whether to reinstall a file

[builder.git] / source / install.cpp

diff --git a/source/install.cpp b/source/install.cpp
index a0029ac1eed33244fea945686d43347d3a8b6628..27bb9a334a970a5936efcad487ce720917bd7588 100644 (file)
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #include "builder.h"
 #include "copy.h"
 #include "executable.h"
+#include "datafile.h"
 #include "header.h"
 #include "install.h"
 #include "package.h"
@@ -31,7 +32,7 @@ void Install::check_rebuild()
 {
        if(!mtime)
                mark_rebuild("Does not exist");
-       else if(source.get_mtime()>mtime)
+       else if(source.get_mtime()>mtime || source.get_size()!=size)
                mark_rebuild(FS::basename(source.get_name())+" has changed");
        else if(source.get_rebuild())
                mark_rebuild(FS::basename(source.get_name())+" needs rebuilding");
@@ -73,6 +74,8 @@ FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string
                mid="lib";
        else if(dynamic_cast<const PkgConfig *>(&tgt))
                mid="lib/pkgconfig";
+       else if(dynamic_cast<const ::DataFile *>(&tgt))
+               mid="share/"+tgt.get_package()->get_name();
 
        if(mid.empty())
                throw InvalidParameterValue("Don't know where to install "+tgtname);