git://git.nikiroo.be
/
nikiroo-utils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d01bd74
)
update Makefile.base: allow including binaries from libs/bin
author
Niki Roo
<niki@nikiroo.be>
Sat, 18 May 2019 13:06:57 +0000
(15:06 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Sat, 18 May 2019 13:06:57 +0000
(15:06 +0200)
Makefile.base
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.base
b/Makefile.base
index fe47347a1df6af94413ae8280c7fbde0d46b05f5..0d365b8448b1c4d7f4bda91c0aca3ff1b70307f8 100644
(file)
--- a/
Makefile.base
+++ b/
Makefile.base
@@
-8,6
+8,7
@@
# - 1.3.0: add 'man' for man(ual) pages
# - 1.4.0: remove android stuff (not working anyway)
# - 1.5.0: include sources and readme/changelog in jar
# - 1.3.0: add 'man' for man(ual) pages
# - 1.4.0: remove android stuff (not working anyway)
# - 1.5.0: include sources and readme/changelog in jar
+# - 1.5.1: include binaries from libs/bin/ into the jar
# Required parameters (the commented out ones are supposed to be per project):
# Required parameters (the commented out ones are supposed to be per project):
@@
-153,6
+154,8
@@
$(NAME).jar: resources
@ls *.md >/dev/null || cp VERSION README.md
@echo "Copying documentation into bin/..."
@cp -r *.md bin/ || cp VERSION bin/no-documentation.md
@ls *.md >/dev/null || cp VERSION README.md
@echo "Copying documentation into bin/..."
@cp -r *.md bin/ || cp VERSION bin/no-documentation.md
+ @[ ! -d libs/bin/ ] || echo "Copying additional binaries from libs/bin/ into bin/..."
+ @[ ! -d libs/bin/ ] || cp -r libs/bin/* bin/
@echo "Copying sources into bin/..."
@cp -r src/* bin/
@echo "Making jar..."
@echo "Copying sources into bin/..."
@cp -r src/* bin/
@echo "Making jar..."