From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 12 Oct 2022 19:40:37 +0000 (-0700)
Subject: Move deployPkgFormat.h to lib/include/deployPkg.
X-Git-Tag: stable-12.2.0~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f759e610c5ceabe420df9f678d23474dd423df4;p=thirdparty%2Fopen-vm-tools.git

Move deployPkgFormat.h to lib/include/deployPkg.
---

diff --git a/open-vm-tools/libDeployPkg/deployPkgFormat.h b/open-vm-tools/lib/include/deployPkg/deployPkgFormat.h
similarity index 100%
rename from open-vm-tools/libDeployPkg/deployPkgFormat.h
rename to open-vm-tools/lib/include/deployPkg/deployPkgFormat.h
diff --git a/open-vm-tools/libDeployPkg/Makefile.am b/open-vm-tools/libDeployPkg/Makefile.am
index 0c1415ec9..754cb8396 100644
--- a/open-vm-tools/libDeployPkg/Makefile.am
+++ b/open-vm-tools/libDeployPkg/Makefile.am
@@ -28,7 +28,6 @@ libDeployPkg_la_LIBADD += @MSPACK_LIBS@
 libDeployPkg_la_LIBADD += @VMTOOLS_LIBS@
 
 libDeployPkg_la_SOURCES =
-libDeployPkg_la_SOURCES += deployPkgFormat.h
 libDeployPkg_la_SOURCES += linuxDeployment.c
 libDeployPkg_la_SOURCES += mspackConfig.h
 libDeployPkg_la_SOURCES += mspackWrapper.c
@@ -51,6 +50,7 @@ libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/log.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/imgcust-common/process.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vm_basic_types.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/tools/guestrpc.h
+libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/deployPkgFormat.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/deployPkg/linuxDeployment.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/deploypkg.h
 libDeployPkg_include_HEADERS += $(top_srcdir)/lib/include/vmware/guestrpc/guestcust-events.h
diff --git a/open-vm-tools/libDeployPkg/linuxDeployment.c b/open-vm-tools/libDeployPkg/linuxDeployment.c
index e80599020..2a9799bc8 100644
--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
+++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
@@ -39,7 +39,7 @@
 #include "str.h"
 
 #include "mspackWrapper.h"
-#include "deployPkgFormat.h"
+#include "deployPkg/deployPkgFormat.h"
 #include "deployPkg/linuxDeployment.h"
 #include "imgcust-common/process.h"
 #include "linuxDeploymentUtilities.h"