Skip to content

Commit b02774f

Browse files
authored
bpo-35296: make install now installs the internal API (GH-10665) (GH-10897)
* bpo-35296: make install now installs the internal API (GH-10665) make install now also installs the internal API: Include/internal/*.h header files. (cherry picked from commit f653fd4) * Windows installer now also install Include/internal/ The Windows installer (MSI) now also install header files of the Include/internal/ subdirectory.
1 parent 0091f34 commit b02774f

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

Makefile.pre.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,11 +1443,21 @@ inclinstall:
14431443
else true; \
14441444
fi; \
14451445
done
1446+
@if test ! -d $(DESTDIR)$(INCLUDEPY)/internal; then \
1447+
echo "Creating directory $(DESTDIR)$(INCLUDEPY)/internal"; \
1448+
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal; \
1449+
else true; \
1450+
fi
14461451
@for i in $(srcdir)/Include/*.h; \
14471452
do \
14481453
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
14491454
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
14501455
done
1456+
@for i in $(srcdir)/Include/internal/*.h; \
1457+
do \
1458+
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \
1459+
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal; \
1460+
done
14511461
$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
14521462

14531463
# Install the library and miscellaneous stuff needed for extending/embedding
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The Windows installer (MSI) now also install internal header files
2+
(``Include/internal/`` subdirectory).
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
``make install`` now also installs the internal API:
2+
``Include/internal/*.h`` header files.

Tools/msi/dev/dev.wixproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<EmbeddedResource Include="*.wxl" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<InstallFiles Include="$(PySourcePath)include\*.h">
24+
<InstallFiles Include="$(PySourcePath)include\**\*.h">
2525
<SourceBase>$(PySourcePath)</SourceBase>
2626
<Source>!(bindpath.src)</Source>
2727
<TargetBase>$(PySourcePath)</TargetBase>
2828
<Target_></Target_>
2929
<Group>dev_include</Group>
3030
</InstallFiles>
3131
</ItemGroup>
32-
32+
3333
<Target Name="BuildMinGWLib"
3434
Inputs="$(BuildPath)$(PyDllName).dll"
3535
Outputs="$(BuildPath)lib$(PyDllName).a"
@@ -46,4 +46,4 @@
4646
</Target>
4747

4848
<Import Project="..\msi.targets" />
49-
</Project>
49+
</Project>

0 commit comments

Comments
 (0)