build/Makefile.common.inc: unset OSMO_REPOSITORY
Don't have a default value for OSMO_REPOSITORY, as this leads to manuals getting uploaded to the wrong directory (publish) target and installed to the wrong directory (install, uninstall). Add checks to ensure the variable is set before using it in install and uninstall. Related: OS#5902 Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4
This commit is contained in:
parent
2d2d795348
commit
59d031823d
|
@ -11,7 +11,6 @@ UPLOAD_PATH ?= generic@sysmocom-downloads:documents
|
|||
SYMLINKS = common build
|
||||
CLEAN_FILES += $(SYMLINKS)
|
||||
PDF_FILES = $(patsubst %.adoc,%.pdf,$(ASCIIDOC)) $(patsubst %.xml,%.pdf,$(VTY_REFERENCE))
|
||||
OSMO_REPOSITORY ?= osmo-gsm-manuals
|
||||
PUBLISH_REF ?= master
|
||||
PUBLISH_TEMPDIR = _publish_tmpdir
|
||||
|
||||
|
@ -49,6 +48,7 @@ publish: $(UPLOAD_FILES)
|
|||
# - installing manuals by default is fine, because Osmocom projects won't include
|
||||
# the whole Makefile.common.inc unless --enable-manuals is passed to configure.
|
||||
install: $(PDF_FILES)
|
||||
[ -n "$(OSMO_REPOSITORY)" ] || exit 1
|
||||
if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \
|
||||
for i in $(PDF_FILES); do \
|
||||
install -vDm644 "$$i" "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i" || exit 1; \
|
||||
|
@ -56,6 +56,7 @@ install: $(PDF_FILES)
|
|||
fi
|
||||
|
||||
uninstall:
|
||||
[ -n "$(OSMO_REPOSITORY)" ] || exit 1
|
||||
if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \
|
||||
for i in $(PDF_FILES); do \
|
||||
rm -v "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i"; \
|
||||
|
|
|
@ -34,6 +34,7 @@ include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
|
|||
|
||||
VTY_REFERENCE = test-vty-reference.xml test2-vty-reference.xml
|
||||
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
|
||||
OSMO_REPOSITORY = osmo-gsm-manuals
|
||||
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue