Skip to content

Commit cd162ca

Browse files
author
David J. Kordsmeier
committed
refs #100848 Merge remote-tracking branch 'origin/100848-packlist-missing-csrc-dir'
* origin/100848-packlist-missing-csrc-dir: refs #100848 Failed to handle relative path on SUBMAKE which breaks on several of the TOPDIRS. Revert handling back to using MAKE for apps, javasrc and doc subdirs.
2 parents 76fbeaf + bffb22d commit cd162ca

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#
1414

1515
# Subdirectories we build in
16-
TOPSUBDIRS = doc/technical doc/manpages csrc schema `cat local.subdirs 2>/dev/null || :`
16+
TOPSUBDIRS = csrc schema `cat local.subdirs 2>/dev/null || :`
1717
# Packing list for packaging
1818
PACKLIST = Makefile README LICENSE NEWS NOTICES configure doc/index.txt \
1919
doc/technical doc/manpages schema android experiments csrc javasrc apps
@@ -29,9 +29,12 @@ SUBMAKE = $(MAKE) -f ../csrc/conf.mk -f Makefile
2929
IBINSTALL = $(SUBMAKE) install \
3030
DINST_BIN=$$ib/bin DINST_INC=$$ib/include DINST_LIB=$$ib/lib
3131
default all: csrc/conf.mk _always
32-
for i in $(TOPSUBDIRS) javsrc apps; do \
32+
for i in $(TOPSUBDIRS); do \
3333
(cd "$$i" && pwd && $(SUBMAKE) $@) || exit 1; \
3434
done
35+
for i in doc/technical doc/manpages javasrc apps; do \
36+
(cd "$$i" && pwd && $(MAKE) $@) || exit 1; \
37+
done
3538
mkdir -p ./lib ./bin
3639
test -d ./include || ln -s ./csrc/include
3740
ib=`pwd` && (cd csrc && $(IBINSTALL))
@@ -45,7 +48,7 @@ clean depend test check shared testinstall install uninstall html: csrc/conf.mk
4548
@rm -f _always
4649

4750
documentation dist-docs : _always
48-
for i in $(TOPSUBDIRS) javasrc apps android; do \
51+
for i in $(TOPSUBDIRS) doc/technical doc/manpages javasrc apps android; do \
4952
(cd "$$i" && pwd && $(MAKE) $@) || exit 1; \
5053
done
5154
@rm -f _always

0 commit comments

Comments
 (0)