[atkmm] NMake Makefiles: Fix header "installation"



commit 7e208cf128fb6ed9c9c8aa2987daede539cc8576
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Apr 1 15:47:50 2020 +0800

    NMake Makefiles: Fix header "installation"
    
    We may have the (generated) headers in $(Outdir)\atkmm, so make sure we
    look for the headers from there as well.

 MSVC_NMake/install.mak | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/MSVC_NMake/install.mak b/MSVC_NMake/install.mak
index 76c1c01..011816e 100644
--- a/MSVC_NMake/install.mak
+++ b/MSVC_NMake/install.mak
@@ -10,7 +10,10 @@ install: all
        @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).pdb $(PREFIX)\bin
        @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\$(ATKMM_LIBNAME).lib $(PREFIX)\lib
        @copy ..\atk\atkmm.h "$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\"
-       @for %h in ($(atkmm_files_built_h) $(atkmm_files_extra_h)) do @copy ..\atk\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
-       @for %h in ($(atkmm_generated_private_headers)) do @copy ..\atk\atkmm\private\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\%h"
+       @for %h in ($(atkmm_files_extra_h)) do @copy ..\atk\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
+       @for %h in ($(atkmm_files_built_h)) do @if exist ..\atk\atkmm\%h copy ..\atk\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
+       @for %h in ($(atkmm_files_built_h)) do @if exist vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\%h copy 
vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\%h"
+       @for %h in ($(atkmm_generated_private_headers)) do @if exist ..\atk\atkmm\private\%h copy 
..\atk\atkmm\private\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\%h"
+       @for %h in ($(atkmm_generated_private_headers)) do @if exist 
vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private\%h copy vs$(VSVER)\$(CFG)\$(PLAT)\atkmm\private\%h 
"$(PREFIX)\include\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\atkmm\private\%h"
        @copy ".\atkmm\atkmmconfig.h" 
"$(PREFIX)\lib\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\include\"
        @copy ..\codegen\m4\*.m4 $(PREFIX)\share\atkmm-$(ATKMM_MAJOR_VERSION).$(ATKMM_MINOR_VERSION)\proc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]